diff -Nru entangle-0.5.1/AUTHORS entangle-0.5.2/AUTHORS --- entangle-0.5.1/AUTHORS 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/AUTHORS 2013-08-17 18:28:18.000000000 +0000 @@ -7,10 +7,14 @@ With further contributions received from: - Thilo Bangert - Cristian Marchi +Cristian Marchi +Daniel Berrange +Daniel P. Berrange +Jesper Pedersen +Simon Booth +Thilo Bangert +berrange ...send patches to get your name here... - -- End of authors diff -Nru entangle-0.5.1/AUTHORS.in entangle-0.5.2/AUTHORS.in --- entangle-0.5.1/AUTHORS.in 1970-01-01 00:00:00.000000000 +0000 +++ entangle-0.5.2/AUTHORS.in 2013-08-17 18:27:47.000000000 +0000 @@ -0,0 +1,14 @@ + Entangle Authors + ================ + +Entangle is written and maintained by: + + Daniel P. Berrange + +With further contributions received from: + +#authorslist# + + ...send patches to get your name here... + +-- End of authors diff -Nru entangle-0.5.1/ChangeLog entangle-0.5.2/ChangeLog --- entangle-0.5.1/ChangeLog 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/ChangeLog 2013-08-17 18:28:18.000000000 +0000 @@ -0,0 +1,1606 @@ +2013-08-17 Daniel P. Berrange + + Update to 0.5.2 release + + Remove use of 'document_mode' field in raw file generation + LibRaw >= 0.15 has removed the 'document_mode' field, so we must + stop using it in Entangle. Fortunately it wasn't doing anything + important for us. + + Remove trailing whitespace + + Switch to automatically generated AUTHORS file + + Refresh translations from transifex + +2013-08-13 Daniel P. Berrange + + Make metadata query robust to missing metadata + To avoid displaying garbage when exif data is unset, change to + explicitly query whether the metadata tag is set before asking + for the value. + + Ensure camera progress functions run in main thread + GTK APIs must only be used from the main thread, so the + camera progress functions must use an idle callback to + switch to the main thread. + + Skip redraw of items without size allocated + In the session browser, it is possible for the item draw + routine to be invoked before a width/height has been set. + This makes pixman rather unhappy, so skip the drawing + operation in this case + + Preserve scrollbar offsets when switching images + When cycling back & forth between images when auto-scale is + not set, preserve the scrollbar offsets. + + Fix double unref of pixbuf when rotating + + Re-arrange nesting of image display + To prevent the image statusbar being resized to fit in the image + scrolled window, re-arrange the nesting of image display. This + puts the statusbar outside the scrolled window. + + Bug #20429 + + Fix args to gtk_grid_attach + +2013-08-09 Daniel P. Berrange + + Use GtkGrid instead of GtkTable if available + For GTK >= 3.2.0 we can use GtkGrid for layout instead + of the deprecated GtkTable + + Remove use of deprecated GStaticMutex + The entangle_camera_is_mounted method can only be called + from the main thread now, so does not need mutex protection. + + Fix enablement of -Werror + +2013-07-09 Daniel P. Berrange + + Add README for translators + Direct translators towards Transifex + +2013-07-08 Daniel P. Berrange + + Refresh translations from transifex + +2013-04-24 Daniel P. Berrange + + Ensure every event is emitted in main thread + Ensure that the pixbuf loader emits events in the main + thread, allowing all calls to gdk threads enter/leave + to be removed + + Add note about 'h' key for histrogram mode toggle + + Refresh translations from transifex + +2013-04-24 Jesper Pedersen + + Add support for linear histogram + Add a config option to allow switching between liner and + logarithmic histrogram rendering + +2013-04-09 Daniel P. Berrange + + Disable static libraries build + +2013-04-09 Simon Booth + + remove several unused variables. Fix variables initialised twice. + +2013-04-02 Daniel P. Berrange + + Remove leftover g_printerr statements + +2013-04-01 Daniel P. Berrange + + Refresh translations from transifex + + Apply orientation from EXIF data to images + If GTK fails to apply any orientation data from the image file, + then fallback to applying orientation data from the exif + metadata block + + Set prefs before loading session + Starting up the session was loaded before the preferences were + applied. Thus, the first image loaded would be processed using + the wrong settings. + +2013-04-01 Jesper Pedersen + + Try to extract preview/thumbnail from raw files + The exiv2 data stream doesn't always contain good thumbnails for + raw files. Try to extract a preview/thumbnail from the raw file + first, then try exiv2, and finally fallback to resizing the main + image + + Set sane default values for processing raw files + Set some default parameters for libraw so that it processes files + using the typical camera defaults. This should give better results, + particularly with Canon raw files. + + Ensure check for raw files is case insensitive + When checking the filename extension to identify raw files, convert + the filename to lowercase first, to ensure the check is case + insensitive + + Only import known image extension in the session + Instead of importing all files to a session, only import files + whose extension is found in a whitelist. This ensures we only + get image files loaded + + Fix aperture and shutter speed metadata in status bar + + Split histogram into RGB colour channels + Instead of drawing a single histogram for the overall intensity, + draw separate graphs for each RGB colour channel. Also draw a + small 4x4 grid overlay. + +2013-03-12 Daniel P. Berrange + + Update for 0.5.1 release + + Refresh translations from transifex + +2013-03-02 Daniel P. Berrange + + Refresh translations from transifex + +2013-03-02 Cristian Marchi + + Add initial Italian translation + + Add missing translation markers on some strings + +2013-02-22 Daniel P. Berrange + + Add support for manual focus control during preview + + Add support for autofocus during preview + + End preview by toggling viewfinder action + If possible, use the view finder control to turn off preview + mode, otherwise fallback to cpaturing an image + + Remove left over variable from gphoto 2.5 compat fix + + Remove debug line + + Add method to query if viewfinder control is possible + + Fix previous methods for autofocus/manualfocus/viewfinder control + + Filter control sections when loading instead of displaying + Make EntangleCamera filter the sections, instead of the + EntangleControlPanel, since some sections are getting formal + APIs in the camera class + + Add APIs for viewfinder/autofocus/manualfocus control + +2013-02-21 Daniel P. Berrange + + Avoid warnings about deprecated mutex/condition var functions + In recent glib2 releases several mutex/condition var functions + are deprecated. Add some macro wrappers to avoid the warnings + + Conditionally use new style gphoto callbacks + In gphoto >= 2.5 many callbacks changed from 'char *fmt, va_args *' + to just 'char *msg'. Conditionally use the right signature based + on version + +2012-12-16 Daniel P. Berrange + + Update for 0.5.0 release + + Fix man page target name + + Fix docs generation + + Add LibRaw to list of deps in README + + Refresh translations + + Add hack to delete both images when exiting preview + Since there is no way to exit preview mode, we must take a + shot and then delete it. If the capture mode is raw+jpeg + we must take care to delete both images that are captured + + Fix session filename generation to cope with dual-format capture + When the camera captures raw+jpeg formats at the same time, both + images must be saved with the same filename prefix + + Rewrite overlay display to be more efficient + Instead of creating one cairo surface per image and overlaying + them during the draw event, overlay the images directly into a + single cairo surface. + +2012-12-09 Daniel P. Berrange + + Tweak debugging in event logging + + Fix updating of range controls + Fix typo which continually reset range controls back to their + original value + +2012-12-05 Daniel P. Berrange + + Add support for onion skin preferences + + Add ability to render an "onion skin" from a list of images + Extend the image display widget to take a list of images. Then + render an "onion skin" overlay with partial opacity. In the + case of a list with 1 entry, the behaviour is as before. + + Change way image pixbufs are cleared + Instead of trying to track which image is used in popups, + just make use of the ref counting in the image loader. Add + "unload" signals to the image loader to enable detection + of when last use is released. + + Sort images by name instead of modified date + + Ensure camera is disconnected on window close/app exit + When hiding a camera manager window, disassociate the + camera, so it gets closed cleanly, otherwise some Canon + cameras will hang. + +2012-11-28 Daniel P. Berrange + + Reindent to normalize whitespace + +2012-11-22 Daniel P. Berrange + + Fix deadlock unmounting camera at startup + The startup code should be using gdk_threads_{enter,leave} + since we make use of threads. When umounting a camera we + entered a recursive main loop. This caused GDK to try to + unlock a mutex that was never locked, corrupting mutex + state. The result was a later hang next time GDK tried to + lock the mutex. + + We can't acquire the mutex in the activate callback, since + that can be called from scenarios where the lock is already + held. Thus we move our code into the startup method instead + and just make activate do a window show. + +2012-11-21 Daniel P. Berrange + + Fix mistake in function prototype name + +2012-09-18 Daniel P. Berrange + + Refresh translations + +2012-09-16 Daniel P. Berrange + + Add preference to control use of embedded image preview for raw files + + Load raw files using LibRaw + Add support for using LibRaw to load raw files. Use the + embedded preview, rather than processing the entire RAW + data. + + Add some more comments to thumbnail loader code + +2012-09-12 Daniel P. Berrange + + Fix typo in man page name + +2012-09-06 Daniel P. Berrange + + Update NEWS for 0.4.1 release + + Allow camera to be NULL + Re-add 9a977e23d9f399b8ae2afab98cddec0022e5a276 accidentally + reverted + + Remove bogus assertion check + + Control histogram height to match default icon panel height + + Use 'src' from finish callback, since priv->camera might be NULL + When saving camera controls using an async callback, make sure the + callback uses the passed in 'src' parameter instead of relying on + priv->camera which may now be NULL + + Allow camera to be NULL in control panel + + Avoid GTK assertion if min=max + The GTK range widgets can't cope with the (entirely reasonable) + scenario where the min value == max value. Hack a workaround for + this by increasing the max value by 1.0 and setting the control + readonly instead + +2012-09-02 Daniel P. Berrange + + Fix unref of cairo surface object in image display + + Add accelerators for menu options + + Add further protection in API calls + +2012-09-01 Daniel P. Berrange + + Add man page and a few misc fixes + Add a man page based on the one in bug 20061 + + Add g_return_if_fail checks to various methods in frontend code + + Remove tabs from previous commit + + Create display of supported camera models + Use gphoto to object a list of supported cameras and introduce + a new dialog for showing them. Fixes bug #19953 + + Remove obsolete GTK 2.x conditionals + Since we require GTK >= 3.0, we can remove conditionals based + on GTK 2.x + + Fix build on GTK < 3.4 + The GDK_SCROLL_SMOOTH constant is only available in GTK >= 3.4 + Bug #19918 + + Rename 'index' variable to 'idx' to avoid symbol clash + There is a global function called 'index' in some headers, so + local variables should not use the same name. Bug #19918 + + Change gfloat to gdouble in image display + There is some inconsistent use of gfloat vs gdouble in files. + Switch to using gdouble in the image display to address this. + Bug #20122 + + Fix some data types to use the glib variants + + Fix aspect ratio string->double conversion to be locale-indepedent + The strtod() function has variable meaning for '.' according to + the locale. This caused the aspect ratio conversions to go wrong. + Switch to using g_ascii_strtod() instead. Bug #19929 + +2012-08-31 Daniel P. Berrange + + Add object type checking to all backend public APIs + +2012-08-30 Daniel P. Berrange + + Add missing include of locale.h + + Fix memory handling when updating plugins + +2012-08-16 Daniel P. Berrange + + Maintain plugin list in preferences & load them on startup + Introduce a new preference which stores the list of plugins + which are loaded. Use the PeasGtkPluginEngine widget to allow + the user to enable/disable plugins + + Load Peas introspection data + The Peas library requires that its GObject Introspection metadata + is loaded prior to searching for plugins + +2012-08-16 Daniel P. Berrange + + Add support for displaying an image histogram in the control panel + The control panel is changed to be always visible even when no + camera is connected. This is to allow it to display the histogram + for the selected image + +2012-08-12 Daniel P. Berrange + + Don't clear image pixbuf while a popup is still open + + Ensure popup-close signal is always invoked in all code paths + + Fix drag popup when image is already selected + If the image was already selected in the session browser, then + a drag would not be initialized. + + Use key press handler in session browser + If the key release handler is used in session browser for + procesing keys, then some parent handler might take action + based on the key press event before we get a chance to + + Fix widget leak when closing image popup + When the EntangleImagePopup class was unref'd the GtkWindow + still remained in existance. Fix this by destroying the window + in the popup finalize method + + Fix memory leak when displaying image popup + If the image already has an active popup, attempting to display + it again will leak a reference count + + Keep toolbar dir in sync with current session dir + + Close all image popups when changing session + + Clear cached image pixbuf when unselecting image + When the current image is selected, set its pixbuf to NULL + +2012-07-08 Daniel P. Berrange + + Ensure RPM builds are verbose + + Add mouse scroll support to session browser widget + + Fix return type of mouse press handler + + Release 0.4.0 + + Add missing RPM BR on intltool. Remove duplicate image + + Refresh translations + + Fix syntax check errors + + Add custom icons for capture/preview + Introduce custom icons for capture & preview buttons + + Add ability to synchronize shooting between windows + Move the 'New window' menu item to a new "Windows" menu, + and introduce a "Synchronize windows" menu item to sync + capture and preview + + Re-enable drag for popups + Re-enable code for D-N-D creation of image popups + + Add popup menu in session browser + Add a popup menu in the session browser which can be used for + deleteing unwanted images, and opening images in external + applications + + Merge 'new session' and 'open session' into 'select session' + Since the "Open Folder" widget is capable of creating folders, + there is no compelling reason for a separate "New folder" + widget. Merge them into one and use a popup menu in the + toolbar for selecting folder + + Add grid lines mode quarters + Add another grid lines mode splitting the screen into quarters + + Add missing property handling + Fix missing property handling for 'img-mask-enabled' + + Enable rendering of focus point / grid lines during preview + Honour the preferences for focus point / grid lines during + preview mode + + preferences for focus point / grid lines + Add preferences to control whether the focus point and grid + lines are displayed during preview mode + + Add ability to draw grid lines in image display + Enhance EntangleImageDisplay to enable it to rendere a set + of grid liens, using various different policies + + Add ability to draw a focus point in the image display + Enhance the EntangleImageDisplay widget to render a center + focus point square + +2012-07-02 Daniel P. Berrange + + Add ability to blank screen while capturing images + Add a new preference to control screen blanking. If enabled, + the screen will be blanked via DPMS Standby mode while the + image is captured, and unblanked afterwards. Any mouse or + keyboard movement will also unblank the screen early. + + Add APIs for screen blanking via X11 DPMS extension + + Fix two horrible memory leaks of EntangleImage + The preview code would leak every single frame captured during + preview. + + The browser code would leak every single image in each folder + opened + + Update RPM spec to add new images + +2012-07-01 Daniel P. Berrange + + Fix misc syntax-check problems + + Add missing imageviewer icons + + Rewrite session browser widget + Stop playing hacks with the GtkIconView class since it is + frequently breaking and does not render in the desired style + + Replace with a custom written widget, derived from the + GtkIconView code, but set to only render everything in + one single row + + Fix update of mask opacity property + + Fix type of aspect ratio property + The aspect ratio property was mistakenly declared as an int + instead of a string. + + Don't fill thumbnail edges with black + Set thumbnail edges to be transparent to allow widget + background colour to show + + Ensure UI updates when aspect ratio preferences are changed + + Allow aspect ratio mask to be toggled on/off more easily + Instead of overloading the 'aspect-ratio' preference to '' to + signify disabled mask, use an explicit 'mask-enabled' pref. + Also allow the key 'm' to toggle it on/off + + Add some key shortcuts for common operations + Allow use of keys + + - 's' - trigger the shutter + - 'p' - toggle 'live view' preview + - 'esc' - cancel the current operation + +2012-06-21 Daniel P. Berrange + + Fix notification of preference changes + + Add preferences for configuring image mask aspect ratio + Add preferences for setting aspect ratio for image mask, + and its opacity. Also add UI for controlling it + +2012-06-19 Daniel P. Berrange + + Extend EntangleImageDisplay to support aspect ratio masks + Allow the image display to mask off the borders of the displayed + image to simulate cropping to an alternate aspect ratio + +2012-04-30 Daniel P. Berrange + + Add preference for auto-connect of cameras + Allow automatic connection at startup to be disabled via + a preference. Also rename 'folders' to 'capture' in glade + + Auto-connect to all cameras on startup + +2012-04-25 Daniel P. Berrange + + Add support for multiple windows + + Rename EntangleContext to EntangleApplication + Nothing in the backend needs to the EntangleContext, so + rename it to EntangleApplication and make it subclass + GtkApplication + + Move camera list population code out of EntangleContext + + Update file header comments + + Properly use GtkApplication by registering windows + + Add missing impl of entangle_context_get_application + + Update for 0.3.3 release + + Remove tabs & exclude .icc files from whitespace check + + Fix test for glib-compile-schemas + We can't assume pkg-config gives us back the fully qualfied + path for glib-compile-schemas, it might just be the binary + name + + Add new translation files + +2012-04-25 Daniel P. Berrange + + Refresh translations + +2012-04-16 Daniel P. Berrange + + Add --system arg support to autogen.sh + + Fix compat with glib < 2.32 + +2012-04-16 Daniel P. Berrange + + Re-enable double buffering of image display widget to avoid flickr in preview mode + + Fix construction of session browser + The GtkIconView class does certain stuff in a constructor rather + than its init method. Thus we need to override the latter to avoid + out of order initialization of the icon view parent + + Fix debugging with newer glib which doesn't enable debug by default + + Remove use of deprecated style/size APIs in ovBox + + Replace gtk_main_quit with g_application_quit + + Replace usage of gdk_display_get_pointer API + + Replace gtk_widget_get_pointer API usage + + Replace box with hbox widget + + Replace gdk_cursor_unref with g_object_unref + + Replace vbox with box and hscale with scale widgets + + Remove calls to gdk lock/unlock when running application + GtkApplication takes care of automatically locking/unlocking + the GDK global mutex when required. Thus we should not be + holding the GDK lock when invoking g_application_run + + Replace gdk_pixbuf_unref with g_object_unref + Reported-by: Glenn Greenfield + +2012-04-04 Daniel P. Berrange + + Only enable -Werror on builds from GIT + +2012-04-03 Daniel P. Berrange + + Update for 0.3.2 release + + Refresh translations + +2012-04-01 Daniel P. Berrange + + Include translations in RPM + + Refresh translations + + Mark New Session & Open Session menu labels for translation + + Cleanup indentation + +2012-04-01 Daniel P. Berrange + + Add _(...) around all translatable strings + +2012-02-16 Daniel P. Berrange + + Mark license & website as non-translatable & refresh po files + +2012-02-16 Daniel P. Berrange + + Add transifex configuration file + + Import initial translations + +2012-02-15 Daniel P. Berrange + + Update git ignore files + + Add missing m4 macros for compile warnings + +2012-02-15 Daniel P. Berrange + + Initial pot file + + Import GNULIB syntax check rules + + Add trailing blanks + + Add missing + + Remove redundant const + + Add GtkBuilder files to POTFILES.in + + Remove 'the the' typo + + Tweak copyright line + + Update AUTHORS file & set a mailmap + + Set locale at startup + + Death to all TABs + + Add basics for i18n + +2012-02-13 Daniel P. Berrange + + Release 0.3.1 + + Update copyright dates + + Add workaround for missing GSettings schemas during startup + +2012-02-12 Daniel P. Berrange + + Fix initial control panel sensitivity + + Avoid running multiple event monitoring threads + + Fix thread locking in status bar hide + + Avoid infinite loop of preview errors + + Avoid double-free of GError after connect failure + + Fix some crashes during camera disconnect + + Use a dedicated struct to store task info + +2012-02-10 Daniel P. Berrange + + Rename async method handlers to use a _finish prefix + + Switch over to GNULIBs compiler warning system + + Fix misc compile warnings + + Fix NULL pointer updating widget sensitivity + + Readd AC_OUTPUT, accidentally removed earlier + + Remove compiled schema file in RPM install + +2012-01-11 Daniel P. Berrange + + Update README notes + +2011-12-05 Daniel P. Berrange + + Add explicit test for glib-compile-schemas & install schemas + Add a test for glib-compile-schemas existing, since some people + may have the pkg-config file, but not the binary. Also add a + warning about the install location + + Cleanup pkg config checks in configure.ac & fix peas variables + +2011-12-05 Daniel P. Berrange + + Fix crash in handling combo lists where option is NULL + +2011-11-28 Daniel P. Berrange + + Update for 0.3.0 release + + Require gphoto2 >= 2.4.11 since earlier versions are buggy + + Remove explicit include of glib/gthread.h + + Rewrite session loading using GIO & filter non-file types + + Add autobuild extra_release in RPM release field + + Fix paths for loading XML builder files + + Switch to automatically generate sections with gtk-doc + + Update news file with info about forthcoming release + +2011-11-27 Daniel P. Berrange + + Fix thread locking when updating controls + + Workaround 100% cpu burn due to GVolumeMonitor object unref + + Wire up support for refreshing settings from camera + + Make control refresh/load & camera connect/disconnect async + + Don't clear image display when disconnecting camera + + Avoid deadlock on camera disconnect & reset meter + +2011-11-26 Daniel P. Berrange + + Tweak styling of control panel + + Add preferences for continuous preview & non-delete of files + + Rework the way settings are handled + Remove the "picture folder" setting, adding a "last session" + parameter which is preserved across restarts. Add setters for + all preferences. + +2011-11-22 Daniel P. Berrange + + Fix deadlock updating controls while progress update is occuring + + Update camera info dialog & remove resize grip + + Change display of control panel + + Fix locking when updating controls + + Remove camera actions and other PTP properties to make UI more practical + + Remove info hint from image display which duplicates metadata display + + Add display of metadata for selected image + + Integrate with GExiv2 to extract metadata + +2011-11-20 Daniel P. Berrange + + Setup transient window hints + + Remove EntangleAppDisplay class and rename EntangleApp to EntangleContext + + Remove obsolete deps from RPM spec + + Fix leaks in preferences code & initialization of RGB path + + Remove HAL support & make peas/introspection compulsory + + Convert from GConf to GSettings + +2011-11-17 Daniel P. Berrange + + Fix locking when updating controls + + Change to perform continuous monitoring and expose preview button + + Fix thread safety when creating color transforms + + Fix crash destroying camera object after disconnecting + + Remove camera schedular classes + + Remove camera scheduler from control panel + + Replace use of camera schedular with async calls + + Add async versions of preview/capture APIs & convert tasks to async capture + + Add async variant of camera file delete method & use in tasks + + Don't send preview images through pixbuf loaders + * backend/entangle-pixbuf-loader.c: Reject requests to handle + images without a filename + * frontend/entangle-camera-manager.c: Don't send preview images + through pixbuf loaders + + Revert 26f0c06dc1d817c2f01e6cc5f09e23636eac44d0 + Don't set a fake filename for in-memory images + + Remove leftover debug + + Convert camera file download to an async method + + Replace job condition with a job mutex for greater fairness + +2011-11-15 Daniel P. Berrange + + Fix check for local copy of sRGB.icc + + Make colour profile class threadsafe and avoid crash if loading profile fails + +2011-10-10 Daniel P. Berrange + + Add mutex locking to EntangleCamera + To avoid for safer multithreaded access, introduce a mutex to + prevent EntangleCamera. When calling into slow gphoto APIs, + drop the mutex, but keep a job lock via a condition variable + + Ensure EntangleImage always has a non-NLL filename + To avoid crashes in the pixbuf loader in preview mode, ensure + that the image always has a non-null filename + + Add GError arg to entangle_camera_connect + +2011-08-22 Daniel P. Berrange + + Add note about the license & source of the logo file + The logo was obtained from + + http://www.openclipart.org/detail/20295/camera-lens-by-rg1024-20295 + + which Open Clip Art makes available under the public domain + + https://creativecommons.org/publicdomain/zero/1.0/ + +2011-06-28 Daniel P. Berrange + + Convert from Glade to GtkBuilder + + Convert code fromm GTK2 to GTK3 + Update to replace all APIS removed in GTK2. + Replace use of libunique/startup with GtkApplication + +2011-02-14 Daniel P. Berrange + + Fixes to ensure it builds when GTK is sealed + +2011-02-11 Daniel P. Berrange + + Refactor image loading code to allow easier access to pixbuf + Directly associate the loaded GdkPixbuf with the EntangleImage + object. This allows multiple UI widget to directly access the + pixbuf without all of them needing to know about the + EntangleImageLoader class. The EntangleCameraManager class + is now in charge of loading/unloading the pixbufs + +2011-02-04 Daniel P. Berrange + + Acquire GDK lock before processing camera disconnect + The camera-removed signal is emitted without GDK locks held. + + * frontend/entangle-app-display.c: Hold GDK lock before + disconnecting camera from UI + + Avoid crash on camera disconnect + The camera schedular thread make continue to run for a short + while after setting the 'quit' flag. Use a condition variable + to ensure we wait until it has shutdown before closing the + camera + + * backend/entangle-camera-scheduler.c: Wait for thread to finish + before returning + * frontend/entangle-camera-manager.c: Release GDK lock before + disconnecting camera to avoid deadlock + +2010-10-06 Daniel P. Berrange + + Update to cope with cameras which have no controls + Some camera drivers claim to support controls, but then don't + return any. This updates the UI code to cope with this situation + instead of crashing + + * frontend/entangle-camera-manager.c: Hide controls panel + and disable settings menu/toolbutton if no controls are + available + * frontend/entangle-control-panel.c, + frontend/entangle-control-panel.h: Export a property if + there are any visible controls + +2010-09-19 Daniel P. Berrange + + Remove website which is now hosted under wordpress + +2010-09-17 Daniel P. Berrange + + Update for 0.2.0 release + * NEWS: Notes about major changes + * configure.ac: Update version number + + Update to require libpeas 0.5.5 + * configure.ac: Update to 0.5.5 peas, s/peas-ui/peas-gtk/ + * entangle.spec.in: Require libpeas-devel >= 0.5.5 + * src/backend/entangle-app.c, + src/backend/entangle-app.c: API changes for libpeas 0.5.5 + +2010-09-15 Daniel P. Berrange + + Ensure filename extension is always lowercase + Some cameras return an uppercase filename. Convert to lowercase + at all times + + Add support for unmounting camera when connecting + Use GIO to unmount the camera if it is in use by gvfs. + +2010-09-14 Daniel P. Berrange + + Remove EntangleParams class that required GPhoto gir hack + The GPhoto-2.0.gir hack is required because EntangleParams + exposes some libgphoto2 typedefs in a public struct. By + removing this class and moving the objects into the private + impl, the GIR hack is no longer required + + Port over to use libpeas for plugins + Remove all custom plugin handling code. Replace with (optional) + use of libpeas. + +2010-07-22 Daniel P. Berrange + + Adapt to cope with cameras which don't support events + The non-PTP drivers do not support event notifications. Adapt the + event flush/wait code to avoid failing in these scenarios, since + capture still works fine + +2010-07-19 Daniel P. Berrange + + Use GError APis for reporting capture failure + Wire up GError for capture, preview, download, delete and event + wait operations. Display error to user if task fails. Log all + gphoto detailed error messages. + + Fix infinite loop waiting for events + Fix an unknown event occurs the loop could potentially go on + forever. Track wallclock time to ensure an absolute upper + bound on waiting for events + + Set worker to NULL when exiting + When the worker thread exits it is important to set priv->worker + to NULL to ensure other methods see it is not running + +2010-06-13 Daniel P. Berrange + + Make a sane implementation of the preview function + Replace the 'cancelled' method on the progress interface, with + a GInterface. Add a 'confirmable' GInterface. Re-write the + preview task to use the confirmable interface to trigger + capture. Fixup exiting of live view when cancelling preview. + + Disable image hint when fullscreen mode + +2010-06-07 Thilo Bangert + + Fix DESTDIR handling in install-data-local rule + +2010-06-07 Daniel P. Berrange + + Fix assumption about some udev parameters always being present + If certain udev parameters were missing (aka NULL) then the + device monitor code would crash with a NULL pointer dereference. + Ignore any events where one of our desired parameters is NULL + to avoid crashing + + Update RPM spec with feedback from Fedora review + +2010-04-08 Daniel Berrange + + Add link to download area + + Bump release to 0.1.0 & other release prep work + * AUTHORS, NEWS: Fill out basic info. + * Makefile.am, gitlog-to-changelog: Setup ChangeLog to be + autogenerated from GIT logs. + * configure.ac Bump release to 0.1.0 + + Fix tagline in about dialog + + Fix bug in thread locking upon error scenarios + When breaking out of the task loop it is neccesary to reacquire the + lock. + +2010-04-07 Daniel Berrange + + Fix hang when changing configuration values + The camera schedular thread runs continuously in the background + waiting for events. It is thus neccessary to pause this background + thread whenever updating a control value in the foreground thread. + +2010-04-05 Daniel Berrange + + Add filename labels in session browser & image info popup + + Fix thumbnail orientation + + Fix logic bug that broke thumbnail resizing + + Set widget readonly state on camera controls + GPhoto now has an API for discovering whether a camera control + is readonly. This can be used to set the GTK widget to be non + sensitive + +2010-04-04 Daniel Berrange + + Rewrite filename generation code to preserve original extension + Rewrite the session filename generation code to preserve the + original filename extension as provided by the camera/gphoto. + ie stop giving raw files a .jpeg extension ! + + Add & ignore GP_EVENT_CAPTURE_COMPLETE to prevent bogus failures + +2010-04-02 Daniel Berrange + + Allow presentation mode to set monitor to diplay on + The view menu gets popupulated with a list of named monitors in + the screen. The presentation mode can be switched between the + different monitors. Fullscreen also now hides the menubar + +2010-03-31 Daniel Berrange + + Add a real presentation mode + Add a real presentation mode where the only thing visible is the image + display window, in fullscreen. + + Use proper glib API for finding user pictures directory + + Port to gudev library + Use the gudev library for monitoring devices in preference to + HAL, where available + + Fix 100% cpu loop on camera disconnect & potential crash + When the camera disconnects care must be taken that all camera + functions return false and not try to access a NULL gphoto camera + object. The background event loop must also check for a disconnected + camera and not spin 100% cpu waiting for events that will never + arrive + + Fix thread safety in task-end callback & disconnect camera + The task-end callback invokes GTK functions and is emitted from + a background thread, thus it must be protected by the GDK threads + lock. + + When the camera is removed from the camera manager, the camera + must be switched to disconnected state + +2010-03-30 Daniel Berrange + + Rename Capa -> Entangle + Renaming the project from "Capa" to "Entangle". This renames all + files with 'capa' in the name, and changes all source code symbols + and strings to match. + +2010-03-18 Daniel P. Berrange + + Add cast from gsize to int to avoid printf warning + +2010-03-15 Daniel P. Berrange + + Readd port property mistakenly removed + +2010-03-14 Daniel P. Berrange + + Add initial impl of gconf configuration store + +2010-03-13 Daniel P. Berrange + + Add setters/getters for control panel, session browser & camera manager objects + +2010-03-12 Daniel P. Berrange + + Remove all unneccessary G_OBJECT casts + + Add getter/setters for image display object properties + + Add setter for camera file mimetype + + Add setters/getters for camera info object + + Add setters/getters to pixbuf loader object + + Add getter & setter for camera progress property + + Standard naming convention for "getters" on camera class + + Cache camera docs to avoid possible thread race condition + The gphoto library must only be used from one thread at once for + absolute safety, so camera driver/manual/summary strings should + be cached just in case + + Fix session changing code + The session changing code was setting a property which no longer + exists on the camera class + +2010-03-06 Daniel P. Berrange + + Fix printf format specifier + + Basic framework for new config management system + * backend/capa-config-entry.h, backend/capa-config-entry.c: Object + for a single configuration value + * backend/capa-config-set.h, backend/capa-config-set.c: Object for + a group of configuration values + * backend/capa-config-store.c, backend/capa-config-store.c: Backing + store for all configuration values + +2010-02-15 Daniel P. Berrange + + Switch capture/preview/monitor over to scheduler task & rip out old code + The old threads code from the camera class is ripped out. The camera + manager frontend now triggers all operations via the new camera + scheduler object. + + Add progress debug logging on control building process + + Fix typo in object class name + + Camera execution script and task system + To make the capture process more flexible, the hardcoded preview, + monitor & capture threads need to be moved out of the camera + class. This commit introduces a general purpose camera scheduler + that runs in a background thread monitoring for events. It then + accepts queuing of tasks to execute. Tasks are provided for the + basic operations. + +2010-02-14 Daniel P. Berrange + + Refactor camera capture routines to prepare for scripts + Introduce an explicit object for representing a file on the camera. + Separate out methods for capturing, downloading & deleting files + from the camera. Rewrite existing background threads to use the + new APIs. + +2010-01-13 Daniel P. Berrange + + Don't abort monitoring when getting an unexpected event + +2010-01-12 berrange + + Ignore Makefile.am file + +2010-01-12 Daniel P. Berrange + + Merge CapaPluginBase into CapaPlugin inteface + The CapaPlugin interface was not serving any useful purpose. This + change merges the CapaPluginBase abstract class into CapaPlugin + removing the interface + +2010-01-11 Daniel P. Berrange + + Fix gint64 printf format specifier for x86_64 + Can't assume that gint64 format specific is %llu on x86_64. GLib + provides a portable macro G_GUINT64_FORMAT so use that instead. + +2010-01-10 Daniel P. Berrange + + Rename all source files added 'capa-' prefix + Avoid potential include file namespace problems by adding a 'capa-' + prefix to all source files + + Integrate with gtk-doc for API reference generation + + Remove auto-generated INSTALL file + + Move debug variables out of main.c into separate debug.c + In order for gtk-doc to link to the library for scanning, it is + neccessary to move the debug flags into a separate file. + + Rename some methods in CapaApp and annotate for introspection data + The introspection transfer mode was incorrect for methods in + CapaApp, so they had to be annotated. The getters are also renamed + to add 'get_' prefix. + +2010-01-09 Daniel P. Berrange + + Turn off colour profile debugging + +2010-01-03 Daniel P. Berrange + + Pass the 'CapaPlugin' instance to the plugin activate methods + The plugin may need to know its base directory in order to load + other assets such as images. To allow for this, it is neccessary + to pass the CapaPlugin instance into the plugin's activate/deactive + methods + + Switch UI out of operation mode when camera is removed + The current camera may be removed from the manager window while an + operation is in progress (particularly when monitoring for new images + in the background). In this case it is neccessary to toggle the + 'inOperation' flag to update the UI + + Remove obsolete, unused 'camera-progress' window definition + The camera progress window was removed in a previous commit, the + progress display being incorporated into the main manager window. + The glade definition of the 'camera-progress' window is thus + obsolete & unused. + + Fix crash in background thread when progress monitor is removed + When disconnecting the UI from a camera, there may still be a + background job active using the progress monitor. Therefore it + is neccessary to include checks for NULL on the progress object + + Disconnect camera from display when camera is removed + When a camera is removed, and it matches the camera currently opened + in the display, it must be removed, disabling the UI. + + Make 'CapaAppDisplay' inherit from 'CapaApp' + The plugins get given a handle to a 'CapaApp' instance. By making + the CapaAppDisplay type inherit from 'CapaApp', they can get access + to the UI objects + + Clarify warning text when camera cannot be connected to + + Fix missing word in camera picker warning message + * src/capa.glade: Add missing 'when' in warning message + +2009-12-29 Daniel P. Berrange + + Include a relative timestamp in log messages + + Basic UI for plugin preferences / management + +2009-12-28 Daniel P. Berrange + + Javascript plugins based on GJS runtime + + Rename GIR data to use initial caps as per GObject standards + + Preliminary plugin script with dlopen() + +2009-12-12 Daniel P. Berrange + + Update screenshots to reflect current UI design + +2009-12-06 Daniel P. Berrange + + Update the website content to match current reality + + Re-order buttons on toolbar to move important ones to the left + + Merge capture/preview/monitor tool buttons into one + Declutter the toolbar slightly by merging the separate buttons for + capture/preview/montior into one button with a drop down menu. This + will also allow scripts to populate the menu with other options + like timed/sequenced shooting + + Pull the progress display into the toolbar instead of popup window + +2009-12-05 Daniel P. Berrange + + Misc enhancements to colour management + * Auto-rebuild colour transform when preferences change + * Fix crash when a profile is NULL + * Honour requested rendering intent + + Auto apply any orientation info when displaying images/thumbnails + +2009-12-04 Daniel P. Berrange + + Fix build ordering dependancy for generated enums + + Remove obsolete comment and class variable + + Introduce an async thumbnail loader + Subclass pixbuf loader to provide a thumbnail loader. Attempts to + following the thumbnail spec for caching thumbnails + + http://jens.triq.net/thumbnail-spec/index.html + + Pull most of image loader out into a abstract pixbuf loader base + Introduce a CapaPixbufLoader base class which does most of the + image loading work. This will allow a subclass for doing thumbnail + generation/loading to reuse most functionality. + +2009-12-02 Daniel P. Berrange + + Integrate with libunique to ensure we're always a single-instance app + + Integrate with startup notification library + + Turn camera manager window into a singleton + Always display the camera manager window, even if no camera is + present. Fix bugs in disconnecting from camera. + + Automatically connect to the camera if exactly one is found + If there is only a choice of one single camera, then we will + automatically connect to it when starting up,instead of showing + the camera picker dialog. + +2009-11-29 Daniel P. Berrange + + Introduce a background image loader for main image display + Use a thread pool to load images in the background without blocking + the main UI. Wire the thread loader into the main image display + panel + +2009-11-28 Daniel P. Berrange + + Wire up preferences to GConf for persistent storage + + Apply changes to preferences from editor form + + Add missing ref count in previous commit + + Apply colour profile transform according to configured preferences + +2009-11-27 Daniel P. Berrange + + Tiny whitespace tweak + + Create a preferences dialog + +2009-11-09 Daniel P. Berrange + + Initial support for ICC profile conversion of images when displayed + Adds basic support for applying ICC profiles to captured images + when displayed in the main image viewer. Needs to be hooked up + to preferences to control rendering intent and ICC filenames + + * capa.spec.in: Add BuildRequires: lcms-devel + * configure.ac: Add pkgconfig check for lcms + * src/Makefile.am: Add lcms linker/cflags + * src/backend/colour-profile.c, src/backend/colour-profile.h: Add + an object for representing a colour profile + * src/frontend/camera-manager.c: Quick nasty hack to apply a profile + +2009-10-20 Daniel P. Berrange + + Really fix threading issues + * src/backend/camera.h, src/backend/camera.c: Add thread funcs + to be registered, and call when emitting signals froma thread. + Remove idle func hack which was useless + * src/frontend/camera-manager.c: Register gdk thread funcs with + camera class. + * src/main.c: Enter threads before running main loop + + Auto-select latest image in session browser + * src/frontend/session-browser.c: Automatically select the latest + image added to list + +2009-10-20 Daniel Berrange + + Fix XML comment syntax + * src/gphoto-2.0.gir: Fix comment syntax + +2009-10-19 Daniel P. Berrange + + Use a server-side pixmap for image display to make expose events fast + Rendering directly from a client side pixbuf made for very slow expose + events. Use a pixmap to cache the data for fast rendering + + * frontend/image-display.c: Add a pixmap cache + +2009-10-19 Daniel Berrange + + Add GObject introspection support + * capa.spec.in: Add deps on gobject-introspection-devel, + gir-repository-devel + * configure.ac: Check for gobject introspection + * src/Makefile.am: Add rules for building tpyelib/gir data + * src/main.c: Add --introspect-dump arg + * src/gphoto-2.0.gir: Add stub for gphoto2 structs + +2009-10-19 Daniel P. Berrange + + Remove all polaroids when closing camera window + +2009-10-18 Daniel P. Berrange + + Move capa_session_add call to a idle func to avoid thread safety problem + + Add missing ref count increment on preferences class + + Refresh session browser when changing camera session + + Kill all tabs, mass ident & add emacs magic to prevent their return + + Turn CapaApp into a proper GObject class + + Change to use a toggle button/menu for showing/hiding camera settings + + Wire up new/open session menus/toolbuttons + + Change default filename pattern to JPEG + + Fix session directory creation + +2009-10-06 Daniel P. Berrange + + Wire up changes to settings propagating back to camera + + Initialize control objects with current values & update display + +2009-10-05 Daniel P. Berrange + + Add tear off image "polaroids" for thumbnails + + Sort thumbnails based on last modified date + + Refresh session thumbnail browser when session gets a new file + + Control monitor button visibility correctly. + +2009-10-04 Daniel P. Berrange + + Use jquery fancybox for pretty screenshot browsing + + Fix RPM spec build / install / dist rules + + Add many screenshots, tweak styles & make it render with IE7 + + Add a few tooltips to the main camera window + + Flesh out basic website pages a little more + + Add PNG icons for windows in all recommended sizes + + Add a dummy field to private struct to avoid gobject assertion + + Fix type name for progress object + + Standardize header file style + + Add #include to all files + + Convert over to glib logging instead of fprintf + + Fix mistaken unref calls in finalizer + + Add custom control objects for each type of data + +2009-10-03 Daniel P. Berrange + + Use widget info for tooltip + + Add basic widget infrastructure for displaying camera controls + + Load image into main display when session browser entry is selected + + Add stupidly inefficient thumbnail loading as temporary demo + + Add the start of a proper icon display for session images + + Add add/remove signals to session object + + Add support for monitoring & autodownloading images triggered from camera + + Fix padding in main split panels + + Add code for generating unique, incrementing filenames for sessions + + Move background thread over to camera class. Use session/images classes + + Add basic classes for managing images and sessions + +2009-10-01 Daniel P. Berrange + + Fix property name for preferences + + Don't reference pixbuf in expose handler if its NULL + + Add desktopfile and RPM spec and look for glade in install path + +2009-09-30 Daniel P. Berrange + + Started a preference modules + + More work on website style/content + +2009-09-28 Daniel P. Berrange + + Tweak website navigation content + + Start work on a basic set of webpages + +2009-09-27 Daniel P. Berrange + + Turn camera list into a gobject. Refresh list in-place & emit signals + + Auto-refresh device list when usb devs are hotplugged/unplugged + + Control UI sensitivity based on camera capabilities + + Add check that camera succesfully connected + + Fix leak of glade objects in finalizers + + Wire up a help about dialog + + Fix up handling of close / delete events on windows + + Fix many memory leaks and add image preview + +2009-09-26 Daniel P. Berrange + + Fix memory leak in camera picker cell renderer + + Basic wiring up of quit/disconnect menus & manager window delete + + Wire up menu items for zoom / fullscreen + + Wire up fullscreen toolbar button + + Add a custom scalable image display widget. Default to 'best fit' + +2009-09-25 Daniel P. Berrange + + Fix crash when closing camera info dialogs + + Add ability to cancel progress operations + + Add progress display when capturing images since it can be very slow + + Convert CapaCamera into a GObject to get ref counting + + Split out compile of frontend and backend + Split the frontend and backend out into separate build libraries. + This ensures only the backend can use libgphoto2 directly and + that the backend doesn't accidentally end up depending on frontend + + Use a private params context per camera object + + Make a note of why we skip the camera called usb: + +2009-09-20 Daniel P. Berrange + + Wire up basic code for extracting list of controls from camera + + Boilerplate classes for settings management + + Add copyright headers to all source files + + Crude experiment making the 'capture' button work + + Add about dialog and camera information display + + Tweak git ignore rules + + Fix compile warnings & add warning message if no cameras are found + + Add autotools magic + + Initial commit of codebase diff -Nru entangle-0.5.1/INSTALL entangle-0.5.2/INSTALL --- entangle-0.5.1/INSTALL 2013-03-12 21:24:37.000000000 +0000 +++ entangle-0.5.2/INSTALL 2013-08-17 18:27:59.000000000 +0000 @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, diff -Nru entangle-0.5.1/Makefile.am entangle-0.5.2/Makefile.am --- entangle-0.5.1/Makefile.am 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/Makefile.am 2013-08-17 18:27:47.000000000 +0000 @@ -29,25 +29,31 @@ $(PACKAGE).spec.in \ GNUmakefile \ cfg.mk \ + AUTHORS.in \ maint.mk \ $(NULL) -MAINTAINERCLEANFILES = ChangeLog +MAINTAINERCLEANFILES = ChangeLog AUTHORS DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc -dist-hook: gen-ChangeLog +dist-hook: gen-ChangeLog gen-AUTHORS -# Generate the ChangeLog file (with all entries since the switch to git) -# and insert it into the directory we're about to use to create a tarball. -gen_start_date = 2009-01-01 -.PHONY: gen-ChangeLog +.PHONY: gen-ChangeLog gen-AUTHORS gen-ChangeLog: if test -d .git; then \ - $(top_srcdir)/build-aux/gitlog-to-changelog \ - --since=$(gen_start_date) > $(distdir)/cl-t; \ - rm -f $(distdir)/ChangeLog; \ - mv $(distdir)/cl-t $(distdir)/ChangeLog; \ - fi + $(top_srcdir)/build-aux/gitlog-to-changelog \ + > $(distdir)/cl-t; \ + rm -f $(distdir)/ChangeLog; \ + mv $(distdir)/cl-t $(distdir)/ChangeLog; \ + fi + +gen-AUTHORS: + $(AM_V_GEN)if test -d $(srcdir)/.git; then \ + out="`cd $(srcdir) && git log --pretty=format:'%aN <%aE>' | sort -u`" && \ + perl -p -e "s/#authorslist#// and print '$$out'" \ + < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \ + mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \ + fi -include $(top_srcdir)/git.mk diff -Nru entangle-0.5.1/Makefile.in entangle-0.5.2/Makefile.in --- entangle-0.5.1/Makefile.in 2013-03-12 21:24:37.000000000 +0000 +++ entangle-0.5.2/Makefile.in 2013-08-17 18:27:59.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 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,11 +78,11 @@ build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/entangle.spec.in $(top_srcdir)/configure AUTHORS \ - COPYING ChangeLog INSTALL NEWS compile config.guess config.sub \ - install-sh ltmain.sh missing +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in $(srcdir)/entangle.spec.in COPYING \ + compile config.guess config.sub install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/entangle-compile-warnings.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ @@ -85,13 +113,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;; \ @@ -99,9 +128,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 @@ -380,15 +430,12 @@ $(PACKAGE).spec.in \ GNUmakefile \ cfg.mk \ + AUTHORS.in \ maint.mk \ $(NULL) -MAINTAINERCLEANFILES = ChangeLog +MAINTAINERCLEANFILES = ChangeLog AUTHORS DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc - -# Generate the ChangeLog file (with all entries since the switch to git) -# and insert it into the directory we're about to use to create a tarball. -gen_start_date = 2009-01-01 all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -460,14 +507,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 \ @@ -488,31 +534,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 \ @@ -528,12 +556,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; \ @@ -545,15 +568,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 @@ -562,18 +581,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) ;; \ @@ -710,9 +727,9 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod u+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ @@ -880,38 +897,44 @@ 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-hook 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-hook 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 + +dist-hook: gen-ChangeLog gen-AUTHORS -dist-hook: gen-ChangeLog -.PHONY: gen-ChangeLog +.PHONY: gen-ChangeLog gen-AUTHORS gen-ChangeLog: if test -d .git; then \ - $(top_srcdir)/build-aux/gitlog-to-changelog \ - --since=$(gen_start_date) > $(distdir)/cl-t; \ - rm -f $(distdir)/ChangeLog; \ - mv $(distdir)/cl-t $(distdir)/ChangeLog; \ - fi + $(top_srcdir)/build-aux/gitlog-to-changelog \ + > $(distdir)/cl-t; \ + rm -f $(distdir)/ChangeLog; \ + mv $(distdir)/cl-t $(distdir)/ChangeLog; \ + fi + +gen-AUTHORS: + $(AM_V_GEN)if test -d $(srcdir)/.git; then \ + out="`cd $(srcdir) && git log --pretty=format:'%aN <%aE>' | sort -u`" && \ + perl -p -e "s/#authorslist#// and print '$$out'" \ + < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \ + mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \ + fi -include $(top_srcdir)/git.mk diff -Nru entangle-0.5.1/NEWS entangle-0.5.2/NEWS --- entangle-0.5.1/NEWS 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/NEWS 2013-08-17 18:27:47.000000000 +0000 @@ -1,6 +1,29 @@ Entangle News ============= +Release 0.5.2 - "Graviton" - 2013-08-17 + + * Split histogram into RGB colour channels + * Fix aperture / shutter speed calculations in status bar + * Only import files with known image extensions + * Use case insensitive file extension check to detect raw files + * Set saner defaults for processing raw files to fix Canon + raw display + * Set preferences before loading session to fix settings + for initial image load + * Apply orientation from EXIF images if image file has none + * Remove left over debug prints + * Add support for linear histogram display mode + * Support 'h' key to toggle linear/log histogram mode + * Ensure all events are emitted in main thread + * Remove use of deprecated GDK thread APIs + * Use GtkGrid instead of deprecated GtkTable + * Ensure status bar is constant size when scaling image + * Preserve scrollbar offsets when switching images + * Make metadata extraction more robust wrt missing fields + * Updated translations from transifex + + Release 0.5.1 - "W Boson" - 2012-03-12 * Update for compatibility with libgphoto 2.5 API diff -Nru entangle-0.5.1/README entangle-0.5.2/README --- entangle-0.5.1/README 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/README 2013-08-17 18:27:47.000000000 +0000 @@ -69,6 +69,7 @@ http://entangle-photo.org/ +Translators please see po/README.I18N for more guidance. UI shortcuts ------------ @@ -79,6 +80,7 @@ - 'p' - Toggle 'live view' preview mode - 'esc' - Cancel the current operation - 'm' - Toggle aspect ratio image mask + - 'h' - Toggle linear / logarithmic histogram - 'a' - Drive autofocus during preview - ',' or '.' - Drive manual focus during preview diff -Nru entangle-0.5.1/aclocal.m4 entangle-0.5.2/aclocal.m4 --- entangle-0.5.1/aclocal.m4 2013-03-12 21:24:34.000000000 +0000 +++ entangle-0.5.2/aclocal.m4 2013-08-17 18:27:57.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.12.2 -*- Autoconf -*- +# generated automatically by aclocal 1.13.4 -*- 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],, @@ -457,7 +458,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, @@ -689,24 +690,22 @@ m4_popdef([pkg_description]) ]) dnl PKG_NOARCH_INSTALLDIR -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# 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, # with or without modifications, as long as this notice is preserved. -# serial 8 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # 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.13' 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.2], [], +m4_if([$1], [1.13.4], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -722,21 +721,19 @@ # 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.2])dnl +[AM_AUTOMAKE_VERSION([1.13.4])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, # with or without modifications, as long as this notice is preserved. -# serial 2 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to # '$srcdir', '$srcdir/..', or '$srcdir/../..'. @@ -784,14 +781,12 @@ # 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, # with or without modifications, as long as this notice is preserved. -# serial 10 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. @@ -817,13 +812,12 @@ 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, # with or without modifications, as long as this notice is preserved. -# serial 17 # There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -1009,19 +1003,18 @@ # 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, # with or without modifications, as long as this notice is preserved. -# serial 6 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ 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 @@ -1050,7 +1043,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 @@ -1084,27 +1077,14 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996-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. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # 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, # with or without modifications, as long as this notice is preserved. -# serial 19 - # 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. @@ -1120,7 +1100,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 @@ -1150,8 +1130,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])], @@ -1205,18 +1184,15 @@ [_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 @@ -1250,14 +1226,12 @@ 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, # with or without modifications, as long as this notice is preserved. -# serial 8 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -1273,14 +1247,12 @@ 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, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -1296,14 +1268,12 @@ # 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, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -1346,14 +1316,12 @@ rm -f confinc confmf ]) -# 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, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_PROG_CC_C_O # -------------- # Like AC_PROG_CC_C_O, but changed for automake. @@ -1382,14 +1350,12 @@ # 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, # with or without modifications, as long as this notice is preserved. -# serial 7 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -1397,11 +1363,10 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # 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 @@ -1414,24 +1379,51 @@ 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]) fi ]) +# -*- Autoconf -*- +# Obsolete and "removed" macros, that must however still report explicit +# error messages when used, to smooth transition. +# +# 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, +# with or without modifications, as long as this notice is preserved. + +AC_DEFUN([AM_CONFIG_HEADER], +[AC_DIAGNOSE([obsolete], +['$0': this macro is obsolete. +You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl +AC_CONFIG_HEADERS($@)]) + +AC_DEFUN([AM_PROG_CC_STDC], +[AC_PROG_CC +am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc +AC_DIAGNOSE([obsolete], +['$0': this macro is obsolete. +You should simply use the 'AC][_PROG_CC' macro instead. +Also, your code should no longer depend upon 'am_cv_prog_cc_stdc', +but upon 'ac_cv_prog_cc_stdc'.])]) + +AC_DEFUN([AM_C_PROTOTYPES], + [AC_FATAL([automatic de-ANSI-fication support has been removed])]) +AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) + # 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, # with or without modifications, as long as this notice is preserved. -# serial 6 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -1457,14 +1449,12 @@ # 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, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], @@ -1540,14 +1530,12 @@ 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, # with or without modifications, as long as this notice is preserved. -# serial 3 - # AM_SILENT_RULES([DEFAULT]) # -------------------------- # Enable less verbose build rules; with the default set to DEFAULT @@ -1602,14 +1590,12 @@ _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, # with or without modifications, as long as this notice is preserved. -# serial 2 - # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor 'install' (even GNU) is that you can't @@ -1632,14 +1618,12 @@ 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, # with or without modifications, as long as this notice is preserved. -# serial 3 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -1653,14 +1637,12 @@ # 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, # with or without modifications, as long as this notice is preserved. -# serial 3 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. @@ -1674,76 +1656,114 @@ # 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 diff -Nru entangle-0.5.1/cfg.mk entangle-0.5.2/cfg.mk --- entangle-0.5.1/cfg.mk 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/cfg.mk 2013-08-17 18:27:47.000000000 +0000 @@ -18,7 +18,6 @@ # Tests not to run as part of "make distcheck". local-checks-to-skip = \ changelog-check \ - check-AUTHORS \ makefile-check \ makefile_path_separator_check \ patch-check \ @@ -105,20 +104,6 @@ # We don't use this feature of maint.mk. prev_version_file = /dev/null -# Give credit where due: -# Ensure that each commit author email address (possibly mapped via -# git log's .mailmap) appears in our AUTHORS file. -sc_check_author_list: - @fail=0; \ - for i in $$(git log --pretty=format:%aE%n|sort -u|grep -v '^$$'); do \ - sanitized=$$(echo "$$i"|LC_ALL=C sed 's/\([^a-zA-Z0-9_@-]\)/\\\1/g'); \ - grep -iq "<$$sanitized>" $(srcdir)/AUTHORS \ - || { printf '%s\n' "$$i" >&2; fail=1; }; \ - done; \ - test $$fail = 1 \ - && echo '$(ME): committer(s) not listed in AUTHORS' >&2; \ - test $$fail = 0 - msg_gen_function = msg_gen_function += g_error msg_gen_function += g_set_error diff -Nru entangle-0.5.1/compile entangle-0.5.2/compile --- entangle-0.5.1/compile 2013-03-12 21:24:37.000000000 +0000 +++ entangle-0.5.2/compile 2013-08-17 18:27:59.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 entangle-0.5.1/config.guess entangle-0.5.2/config.guess --- entangle-0.5.1/config.guess 2013-03-12 21:24:37.000000000 +0000 +++ entangle-0.5.2/config.guess 2013-08-17 18:27:59.000000000 +0000 @@ -1,14 +1,12 @@ #! /bin/sh # 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. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-06-10' +timestamp='2013-06-10' # 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 +20,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,.*/,,'` @@ -54,9 +50,7 @@ GNU config.guess ($timestamp) 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. +Copyright 1992-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." @@ -138,6 +132,27 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -200,6 +215,10 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -302,7 +321,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:*:*) @@ -801,6 +820,9 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -852,21 +874,21 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -879,59 +901,54 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -950,54 +967,63 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1201,6 +1227,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 ;; @@ -1227,19 +1256,21 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1330,9 +1361,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 <. @@ -26,11 +20,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. @@ -73,9 +68,7 @@ version="\ 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. +Copyright 1992-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 +116,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 +149,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 +252,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 | arceb \ + | 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 +268,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 \ @@ -291,16 +286,17 @@ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ - | or32 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -370,7 +366,7 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ @@ -389,7 +385,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-* \ @@ -407,12 +404,13 @@ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -788,9 +786,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 @@ -1004,7 +1006,7 @@ ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown @@ -1019,7 +1021,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1346,21 +1352,21 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -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* \ @@ -1492,9 +1498,6 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1586,6 +1589,9 @@ mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff -Nru entangle-0.5.1/configure entangle-0.5.2/configure --- entangle-0.5.1/configure 2013-03-12 21:24:35.000000000 +0000 +++ entangle-0.5.2/configure 2013-08-17 18:27:58.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for entangle 0.5.1. +# Generated by GNU Autoconf 2.69 for entangle 0.5.2. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='entangle' PACKAGE_TARNAME='entangle' -PACKAGE_VERSION='0.5.1' -PACKAGE_STRING='entangle 0.5.1' +PACKAGE_VERSION='0.5.2' +PACKAGE_STRING='entangle 0.5.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -868,8 +868,8 @@ enable_option_checking enable_silent_rules enable_dependency_tracking -enable_shared enable_static +enable_shared with_pic enable_fast_install with_gnu_ld @@ -1468,7 +1468,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 entangle 0.5.1 to adapt to many kinds of systems. +\`configure' configures entangle 0.5.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1538,7 +1538,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of entangle 0.5.1:";; + short | recursive ) echo "Configuration of entangle 0.5.2:";; esac cat <<\_ACEOF @@ -1552,8 +1552,8 @@ do not reject slow dependency extractors --disable-dependency-tracking speeds up one-time build + --enable-static[=PKGS] build static libraries [default=no] --enable-shared[=PKGS] build shared libraries [default=yes] - --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) @@ -1710,7 +1710,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -entangle configure 0.5.1 +entangle configure 0.5.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2075,7 +2075,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by entangle $as_me 0.5.1, which was +It was created by entangle $as_me 0.5.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2426,7 +2426,7 @@ ac_config_headers="$ac_config_headers config.h" -am__api_version='1.12' +am__api_version='1.13' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2639,8 +2639,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 @@ -2880,6 +2880,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." @@ -2902,7 +2941,7 @@ # Define the identity of the package. PACKAGE='entangle' - VERSION='0.5.1' + VERSION='0.5.2' cat >>confdefs.h <<_ACEOF @@ -2942,6 +2981,10 @@ # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -2951,6 +2994,7 @@ + # Use the silent-rules feature when possible. # Check whether --enable-silent-rules was given. @@ -8003,36 +8047,27 @@ # Set options - - - - enable_dlopen=no - - - enable_win32_dll=no - - - # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then : - enableval=$enable_shared; p=${PACKAGE-default} +# Check whether --enable-static was given. +if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; + yes) enable_static=yes ;; + no) enable_static=no ;; *) - enable_shared=no + enable_static=no # Look at the argument we got. We use all the common list separators. lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," for pkg in $enableval; do IFS="$lt_save_ifs" if test "X$pkg" = "X$p"; then - enable_shared=yes + enable_static=yes fi done IFS="$lt_save_ifs" ;; esac else - enable_shared=yes + enable_static=no fi @@ -8043,27 +8078,34 @@ - # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then : - enableval=$enable_static; p=${PACKAGE-default} + + enable_dlopen=no + + + enable_win32_dll=no + + + # Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; + yes) enable_shared=yes ;; + no) enable_shared=no ;; *) - enable_static=no + enable_shared=no # Look at the argument we got. We use all the common list separators. lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," for pkg in $enableval; do IFS="$lt_save_ifs" if test "X$pkg" = "X$p"; then - enable_static=yes + enable_shared=yes fi done IFS="$lt_save_ifs" ;; esac else - enable_static=yes + enable_shared=yes fi @@ -8075,6 +8117,7 @@ + # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : withval=$with_pic; lt_p=${PACKAGE-default} @@ -13748,31 +13791,11 @@ # Put the nasty error message in config.log where it belongs echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0) were not met: - -$GTKDOC_DEPS_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS -and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 + : elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS -and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } + : else GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS @@ -13807,6 +13830,10 @@ enable_gtk_doc_pdf=no fi + if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 + fi + if test x$enable_gtk_doc = xyes; then ENABLE_GTK_DOC_TRUE= @@ -14921,7 +14948,7 @@ fi - if test "$enable_werror" = "yes" + if test "$set_werror" = "yes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler handles -Werror" >&5 $as_echo_n "checking whether compiler handles -Werror... " >&6; } @@ -16365,7 +16392,6 @@ ac_libobjs= ac_ltlibobjs= -U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -16825,7 +16851,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by entangle $as_me 0.5.1, which was +This file was extended by entangle $as_me 0.5.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16895,7 +16921,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -entangle config.status 0.5.1 +entangle config.status 0.5.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -17026,8 +17052,8 @@ delay_variable_subst='$delay_variable_subst' macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' -enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' +enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' @@ -17958,7 +17984,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 @@ -18009,7 +18035,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 @@ -18108,12 +18134,12 @@ macro_version=$macro_version macro_revision=$macro_revision -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - # Whether or not to build static libraries. build_old_libs=$enable_static +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared + # What type of objects to build. pic_mode=$pic_mode diff -Nru entangle-0.5.1/configure.ac entangle-0.5.2/configure.ac --- entangle-0.5.1/configure.ac 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/configure.ac 2013-08-17 18:27:47.000000000 +0000 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([entangle], [0.5.1]) +AC_INIT([entangle], [0.5.2]) AC_CONFIG_SRCDIR([src/entangle-main.c]) AM_CONFIG_HEADER([config.h]) dnl Make automake keep quiet about wildcards & other GNUmake-isms @@ -54,7 +54,7 @@ AC_PROG_CC_STDC AM_PROG_CC_C_O -AM_PROG_LIBTOOL +LT_INIT([disable-static]) PKG_CHECK_MODULES([GLIB], [glib-2.0 >= $GLIB_REQUIRED]) diff -Nru entangle-0.5.1/debian/changelog entangle-0.5.2/debian/changelog --- entangle-0.5.1/debian/changelog 2013-03-17 05:39:19.000000000 +0000 +++ entangle-0.5.2/debian/changelog 2013-08-23 17:19:18.000000000 +0000 @@ -1,3 +1,27 @@ +entangle (0.5.2-dhor1~precise) precise; urgency=low + + * Split histogram into RGB colour channels + * Fix aperture / shutter speed calculations in status bar + * Only import files with known image extensions + * Use case insensitive file extension check to detect raw files + * Set saner defaults for processing raw files to fix Canon + raw display + * Set preferences before loading session to fix settings + for initial image load + * Apply orientation from EXIF images if image file has none + * Remove left over debug prints + * Add support for linear histogram display mode + * Support 'h' key to toggle linear/log histogram mode + * Ensure all events are emitted in main thread + * Remove use of deprecated GDK thread APIs + * Use GtkGrid instead of deprecated GtkTable + * Ensure status bar is constant size when scaling image + * Preserve scrollbar offsets when switching images + * Make metadata extraction more robust wrt missing fields + * Updated translations from transifex + + -- Dariusz Duma Fri, 23 Aug 2013 18:41:36 +0200 + entangle (0.5.1-dhor1~precise) precise; urgency=low * Update for compatibility with libgphoto 2.5 API callbacks diff -Nru entangle-0.5.1/depcomp entangle-0.5.2/depcomp --- entangle-0.5.1/depcomp 2013-03-12 21:24:37.000000000 +0000 +++ entangle-0.5.2/depcomp 2013-08-17 18:27:59.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2012-03-27.16; # UTC +scriptversion=2013-05-30.07; # 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,113 @@ 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" + aix_post_process_depfile + ;; + +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 -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$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" ;; -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 +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using '\': + # 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. - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + 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 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # 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 + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi + + 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 \'. + # 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" + # `$object: dependent.h' and one to simply `dependent.h:'. + 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" rm -f "$tmpdepfile" ;; @@ -341,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 @@ -354,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 @@ -365,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 @@ -445,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 @@ -472,6 +552,7 @@ G p }' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash rm -f "$tmpdepfile" ;; @@ -523,13 +604,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" ;; @@ -582,10 +664,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 ;; @@ -621,10 +705,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" @@ -656,15 +740,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 entangle-0.5.1/docs/Makefile.in entangle-0.5.2/docs/Makefile.in --- entangle-0.5.1/docs/Makefile.in 2013-03-12 21:24:37.000000000 +0000 +++ entangle-0.5.2/docs/Makefile.in 2013-08-17 18:27:59.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 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,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = docs -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/entangle-compile-warnings.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ @@ -79,13 +107,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;; \ @@ -93,9 +122,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) @@ -376,14 +425,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 +452,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 +474,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 +486,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 +499,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 +674,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 entangle-0.5.1/docs/man/Makefile.in entangle-0.5.2/docs/man/Makefile.in --- entangle-0.5.1/docs/man/Makefile.in 2013-03-12 21:24:37.000000000 +0000 +++ entangle-0.5.2/docs/man/Makefile.in 2013-08-17 18:27:59.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 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,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = docs/man -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/entangle-compile-warnings.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ @@ -79,13 +107,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;; \ @@ -93,9 +122,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) @@ -375,14 +424,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 +451,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 +473,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 +485,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 +498,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 +673,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 entangle-0.5.1/docs/man/en/Makefile.in entangle-0.5.2/docs/man/en/Makefile.in --- entangle-0.5.1/docs/man/en/Makefile.in 2013-03-12 21:24:37.000000000 +0000 +++ entangle-0.5.2/docs/man/en/Makefile.in 2013-08-17 18:27:59.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 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; \ - 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@ @@ -50,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = docs/man/en -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/entangle-compile-warnings.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ @@ -115,6 +143,7 @@ am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff MANS = $(man1_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -404,29 +433,14 @@ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: 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)'; \ @@ -565,16 +579,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-man install-man1 \ - 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-man uninstall-man1 + 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-man1 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-man \ + uninstall-man1 entangle.1: entangle.pod diff -Nru entangle-0.5.1/docs/man/en/entangle.1 entangle-0.5.2/docs/man/en/entangle.1 --- entangle-0.5.1/docs/man/en/entangle.1 2013-03-12 21:25:36.000000000 +0000 +++ entangle-0.5.2/docs/man/en/entangle.1 2013-08-17 18:28:10.000000000 +0000 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.20) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.20) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ENTANGLE 1" -.TH ENTANGLE 1 "2013-03-12" "entangle-0.5.1" "User Commands" +.TH ENTANGLE 1 "2013-08-17" "entangle-0.5.2" "User Commands" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -133,7 +142,7 @@ entangle \- tethered camera control & capture .SH "SYNOPSIS" .IX Header "SYNOPSIS" -entangle [\s-1OPTION\s0...] +entangle [\s-1OPTION...\s0] .SH "DESCRIPTION" .IX Header "DESCRIPTION" Entangle provides a graphical interface for \*(L"tethered shooting\*(R", aka @@ -169,10 +178,10 @@ Copyright (C) 2009\-2012 by Daniel P. Berrange .SH "LICENSE" .IX Header "LICENSE" -Entangle is distributed under the terms of the \s-1GNU\s0 \s-1GPL\s0 v3+. +Entangle is distributed under the terms of the \s-1GNU GPL\s0 v3+. This is free software; see the source for copying conditions. There -is \s-1NO\s0 warranty; not even for \s-1MERCHANTABILITY\s0 or \s-1FITNESS\s0 \s-1FOR\s0 A \s-1PARTICULAR\s0 -\&\s-1PURPOSE\s0 +is \s-1NO\s0 warranty; not even for \s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR +PURPOSE\s0 .SH "SEE ALSO" .IX Header "SEE ALSO" \&\f(CWgphoto2(1)\fR, \f(CWlibgphoto2(3)\fR diff -Nru entangle-0.5.1/docs/reference/Entangle-sections.txt entangle-0.5.2/docs/reference/Entangle-sections.txt --- entangle-0.5.1/docs/reference/Entangle-sections.txt 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/Entangle-sections.txt 2013-08-17 18:28:18.000000000 +0000 @@ -3,16 +3,16 @@ ViewAutoDrawer ViewAutoDrawer ViewAutoDrawerClass -ViewAutoDrawer_Close ViewAutoDrawer_GetType ViewAutoDrawer_New +ViewAutoDrawer_SetSlideDelay +ViewAutoDrawer_SetOverlapPixels +ViewAutoDrawer_SetNoOverlapPixels ViewAutoDrawer_SetActive +ViewAutoDrawer_SetPinned ViewAutoDrawer_SetFill -ViewAutoDrawer_SetNoOverlapPixels ViewAutoDrawer_SetOffset -ViewAutoDrawer_SetOverlapPixels -ViewAutoDrawer_SetPinned -ViewAutoDrawer_SetSlideDelay +ViewAutoDrawer_Close VIEW_AUTODRAWER VIEW_AUTODRAWER_CLASS @@ -28,11 +28,11 @@ ViewDrawer ViewDrawer ViewDrawerClass -ViewDrawer_GetCloseTime ViewDrawer_GetType ViewDrawer_New -ViewDrawer_SetGoal ViewDrawer_SetSpeed +ViewDrawer_SetGoal +ViewDrawer_GetCloseTime VIEW_DRAWER VIEW_DRAWER_CLASS @@ -48,10 +48,10 @@ EntangleApplication EntangleApplication EntangleApplicationClass +entangle_application_new entangle_application_get_cameras -entangle_application_get_plugin_engine entangle_application_get_preferences -entangle_application_new +entangle_application_get_plugin_engine ENTANGLE_APPLICATION ENTANGLE_APPLICATION_CLASS @@ -68,59 +68,59 @@ EntangleCamera EntangleCamera EntangleCameraClass -entangle_camera_autofocus -entangle_camera_autofocus_async -entangle_camera_autofocus_finish -entangle_camera_capture_image -entangle_camera_capture_image_async -entangle_camera_capture_image_finish +entangle_camera_new +entangle_camera_get_model +entangle_camera_get_port entangle_camera_connect entangle_camera_connect_async entangle_camera_connect_finish -entangle_camera_delete_file -entangle_camera_delete_file_async -entangle_camera_delete_file_finish entangle_camera_disconnect entangle_camera_disconnect_async entangle_camera_disconnect_finish +entangle_camera_get_connected +entangle_camera_get_summary +entangle_camera_get_manual +entangle_camera_get_driver +entangle_camera_capture_image +entangle_camera_capture_image_async +entangle_camera_capture_image_finish +entangle_camera_preview_image +entangle_camera_preview_image_async +entangle_camera_preview_image_finish entangle_camera_download_file entangle_camera_download_file_async entangle_camera_download_file_finish -entangle_camera_get_connected -entangle_camera_get_controls -entangle_camera_get_driver +entangle_camera_delete_file +entangle_camera_delete_file_async +entangle_camera_delete_file_finish +entangle_camera_process_events +entangle_camera_process_events_async +entangle_camera_process_events_finish +entangle_camera_set_viewfinder +entangle_camera_set_viewfinder_async +entangle_camera_set_viewfinder_finish +entangle_camera_autofocus +entangle_camera_autofocus_async +entangle_camera_autofocus_finish +entangle_camera_manualfocus +entangle_camera_manualfocus_async +entangle_camera_manualfocus_finish entangle_camera_get_has_capture entangle_camera_get_has_preview entangle_camera_get_has_settings entangle_camera_get_has_viewfinder -entangle_camera_get_manual -entangle_camera_get_model -entangle_camera_get_port -entangle_camera_get_progress -entangle_camera_get_summary -entangle_camera_is_mounted entangle_camera_load_controls entangle_camera_load_controls_async entangle_camera_load_controls_finish -entangle_camera_manualfocus -entangle_camera_manualfocus_async -entangle_camera_manualfocus_finish -entangle_camera_mount_async -entangle_camera_mount_finish -entangle_camera_new -entangle_camera_preview_image -entangle_camera_preview_image_async -entangle_camera_preview_image_finish -entangle_camera_process_events -entangle_camera_process_events_async -entangle_camera_process_events_finish entangle_camera_save_controls entangle_camera_save_controls_async entangle_camera_save_controls_finish +entangle_camera_get_controls entangle_camera_set_progress -entangle_camera_set_viewfinder -entangle_camera_set_viewfinder_async -entangle_camera_set_viewfinder_finish +entangle_camera_get_progress +entangle_camera_is_mounted +entangle_camera_mount_async +entangle_camera_mount_finish entangle_camera_unmount_async entangle_camera_unmount_finish @@ -139,14 +139,14 @@ EntangleCameraFile EntangleCameraFile EntangleCameraFileClass -entangle_camera_file_get_data +entangle_camera_file_new entangle_camera_file_get_folder -entangle_camera_file_get_mimetype entangle_camera_file_get_name -entangle_camera_file_new entangle_camera_file_save_path entangle_camera_file_save_uri +entangle_camera_file_get_data entangle_camera_file_set_data +entangle_camera_file_get_mimetype entangle_camera_file_set_mimetype ENTANGLE_CAMERA_FILE @@ -165,14 +165,14 @@ EntangleCameraInfo EntangleCameraInfoClass EntangleCameraInfoData -entangle_camera_info_get_camera -entangle_camera_info_get_data +entangle_camera_info_new entangle_camera_info_get_window +entangle_camera_info_show entangle_camera_info_hide -entangle_camera_info_new -entangle_camera_info_set_camera entangle_camera_info_set_data -entangle_camera_info_show +entangle_camera_info_get_data +entangle_camera_info_set_camera +entangle_camera_info_get_camera ENTANGLE_CAMERA_INFO ENTANGLE_CAMERA_INFO_CLASS @@ -191,15 +191,15 @@ EntangleCameraList EntangleCameraList EntangleCameraListClass -entangle_camera_list_add +entangle_camera_list_new +entangle_camera_list_refresh entangle_camera_list_count -entangle_camera_list_find +entangle_camera_list_add +entangle_camera_list_remove entangle_camera_list_get entangle_camera_list_get_cameras +entangle_camera_list_find entangle_camera_list_get_supported -entangle_camera_list_new -entangle_camera_list_refresh -entangle_camera_list_remove ENTANGLE_CAMERA_LIST ENTANGLE_CAMERA_LIST_CLASS @@ -216,17 +216,17 @@ EntangleCameraManager EntangleCameraManager EntangleCameraManagerClass -entangle_camera_manager_capture -entangle_camera_manager_get_application -entangle_camera_manager_get_camera +entangle_camera_manager_new entangle_camera_manager_get_window +entangle_camera_manager_show entangle_camera_manager_hide -entangle_camera_manager_new +entangle_camera_manager_capture entangle_camera_manager_preview_begin entangle_camera_manager_preview_cancel -entangle_camera_manager_set_camera -entangle_camera_manager_show entangle_camera_manager_visible +entangle_camera_manager_set_camera +entangle_camera_manager_get_camera +entangle_camera_manager_get_application ENTANGLE_CAMERA_MANAGER ENTANGLE_CAMERA_MANAGER_CLASS @@ -243,10 +243,10 @@ EntangleCameraPicker EntangleCameraPicker EntangleCameraPickerClass -entangle_camera_picker_get_window -entangle_camera_picker_hide entangle_camera_picker_new +entangle_camera_picker_get_window entangle_camera_picker_show +entangle_camera_picker_hide entangle_camera_picker_visible ENTANGLE_CAMERA_PICKER @@ -265,12 +265,12 @@ ENTANGLE_TYPE_CAMERA_SUPPORT_DATA EntangleCameraSupport EntangleCameraSupportClass -entangle_camera_support_get_camera_list +entangle_camera_support_new entangle_camera_support_get_window +entangle_camera_support_show entangle_camera_support_hide -entangle_camera_support_new entangle_camera_support_set_camera_list -entangle_camera_support_show +entangle_camera_support_get_camera_list ENTANGLE_CAMERA_SUPPORT ENTANGLE_CAMERA_SUPPORT_CLASS @@ -284,24 +284,24 @@
entangle-colour-profile -EntangleColourProfile EntangleColourProfileTransform +EntangleColourProfile EntangleColourProfile EntangleColourProfileClass -EntangleColourProfileIntent EntangleColourProfileTransform EntangleColourProfileTransformClass -entangle_colour_profile_copyright -entangle_colour_profile_filename -entangle_colour_profile_manufacturer -entangle_colour_profile_model -entangle_colour_profile_new_data +EntangleColourProfileIntent entangle_colour_profile_new_file +entangle_colour_profile_new_data +entangle_colour_profile_filename +entangle_colour_profile_product_name entangle_colour_profile_product_desc entangle_colour_profile_product_info -entangle_colour_profile_product_name -entangle_colour_profile_transform_apply +entangle_colour_profile_manufacturer +entangle_colour_profile_model +entangle_colour_profile_copyright entangle_colour_profile_transform_new +entangle_colour_profile_transform_apply ENTANGLE_COLOUR_PROFILE ENTANGLE_COLOUR_PROFILE_CLASS @@ -333,14 +333,14 @@ EntangleControl EntangleControl EntangleControlClass -entangle_control_get_dirty +entangle_control_new entangle_control_get_id -entangle_control_get_info -entangle_control_get_label entangle_control_get_path -entangle_control_get_readonly -entangle_control_new +entangle_control_get_label +entangle_control_get_info +entangle_control_get_dirty entangle_control_set_dirty +entangle_control_get_readonly entangle_control_set_readonly ENTANGLE_CONTROL @@ -375,10 +375,10 @@ EntangleControlChoice EntangleControlChoice EntangleControlChoiceClass +entangle_control_choice_new entangle_control_choice_add_entry entangle_control_choice_entry_count entangle_control_choice_entry_get -entangle_control_choice_new ENTANGLE_CONTROL_CHOICE ENTANGLE_CONTROL_CHOICE_CLASS @@ -412,11 +412,11 @@ EntangleControlGroup EntangleControlGroup EntangleControlGroupClass +entangle_control_group_new entangle_control_group_add entangle_control_group_count entangle_control_group_get entangle_control_group_get_by_path -entangle_control_group_new ENTANGLE_CONTROL_GROUP ENTANGLE_CONTROL_GROUP_CLASS @@ -433,10 +433,10 @@ EntangleControlPanel EntangleControlPanel EntangleControlPanelClass -entangle_control_panel_get_camera -entangle_control_panel_get_has_controls entangle_control_panel_new entangle_control_panel_set_camera +entangle_control_panel_get_camera +entangle_control_panel_get_has_controls ENTANGLE_CONTROL_PANEL ENTANGLE_CONTROL_PANEL_CLASS @@ -453,10 +453,10 @@ EntangleControlRange EntangleControlRange EntangleControlRangeClass -entangle_control_range_get_max +entangle_control_range_new entangle_control_range_get_min +entangle_control_range_get_max entangle_control_range_get_step -entangle_control_range_new ENTANGLE_CONTROL_RANGE ENTANGLE_CONTROL_RANGE_CLASS @@ -504,11 +504,11 @@
entangle-debug -ENTANGLE_DEBUG entangle_debug_app entangle_debug_gphoto -entangle_debug_setup entangle_debug_startms +entangle_debug_setup +ENTANGLE_DEBUG
@@ -516,8 +516,8 @@ EntangleDeviceManager EntangleDeviceManager EntangleDeviceManagerClass -entangle_device_manager_has_port entangle_device_manager_new +entangle_device_manager_has_port entangle_device_manager_port_serial ENTANGLE_DEVICE_MANAGER @@ -540,10 +540,10 @@ EntangleHelpAbout EntangleHelpAbout EntangleHelpAboutClass -entangle_help_about_get_window -entangle_help_about_hide entangle_help_about_new +entangle_help_about_get_window entangle_help_about_show +entangle_help_about_hide ENTANGLE_HELP_ABOUT ENTANGLE_HELP_ABOUT_CLASS @@ -560,16 +560,16 @@ EntangleImage EntangleImage EntangleImageClass -entangle_image_delete -entangle_image_get_file_size +entangle_image_new_file +entangle_image_new_pixbuf entangle_image_get_filename entangle_image_get_last_modified -entangle_image_get_metadata +entangle_image_get_file_size +entangle_image_delete entangle_image_get_pixbuf -entangle_image_new_file -entangle_image_new_pixbuf -entangle_image_set_metadata entangle_image_set_pixbuf +entangle_image_get_metadata +entangle_image_set_metadata ENTANGLE_IMAGE ENTANGLE_IMAGE_CLASS @@ -586,26 +586,27 @@ EntangleImageDisplay EntangleImageDisplay EntangleImageDisplayClass -EntangleImageDisplayGrid -entangle_image_display_get_aspect_ratio -entangle_image_display_get_autoscale -entangle_image_display_get_focus_point -entangle_image_display_get_grid_display +entangle_image_display_new +entangle_image_display_set_image entangle_image_display_get_image +entangle_image_display_set_image_list entangle_image_display_get_image_list -entangle_image_display_get_mask_enabled -entangle_image_display_get_mask_opacity +entangle_image_display_set_autoscale +entangle_image_display_get_autoscale +entangle_image_display_set_scale entangle_image_display_get_scale -entangle_image_display_new entangle_image_display_set_aspect_ratio -entangle_image_display_set_autoscale +entangle_image_display_get_aspect_ratio +entangle_image_display_set_mask_opacity +entangle_image_display_get_mask_opacity +entangle_image_display_set_mask_enabled +entangle_image_display_get_mask_enabled entangle_image_display_set_focus_point +entangle_image_display_get_focus_point +entangle_image_display_get_loaded +EntangleImageDisplayGrid entangle_image_display_set_grid_display -entangle_image_display_set_image -entangle_image_display_set_image_list -entangle_image_display_set_mask_enabled -entangle_image_display_set_mask_opacity -entangle_image_display_set_scale +entangle_image_display_get_grid_display ENTANGLE_IMAGE_DISPLAY ENTANGLE_IMAGE_DISPLAY_CLASS @@ -629,9 +630,11 @@ EntangleImageHistogram EntangleImageHistogram EntangleImageHistogramClass -entangle_image_histogram_get_image entangle_image_histogram_new entangle_image_histogram_set_image +entangle_image_histogram_get_image +entangle_image_histogram_set_histogram_linear +entangle_image_histogram_get_histogram_linear ENTANGLE_IMAGE_HISTOGRAM ENTANGLE_IMAGE_HISTOGRAM_CLASS @@ -648,10 +651,10 @@ EntangleImageLoader EntangleImageLoader EntangleImageLoaderClass -entangle_image_loader_add -entangle_image_loader_get_embedded_preview entangle_image_loader_new +entangle_image_loader_add entangle_image_loader_remove +entangle_image_loader_get_embedded_preview entangle_image_loader_set_embedded_preview ENTANGLE_IMAGE_LOADER @@ -669,13 +672,13 @@ EntangleImagePopup EntangleImagePopup EntangleImagePopupClass -entangle_image_popup_get_image -entangle_image_popup_hide -entangle_image_popup_move_to_monitor entangle_image_popup_new -entangle_image_popup_set_image entangle_image_popup_show +entangle_image_popup_move_to_monitor entangle_image_popup_show_on_monitor +entangle_image_popup_hide +entangle_image_popup_set_image +entangle_image_popup_get_image ENTANGLE_IMAGE_POPUP ENTANGLE_IMAGE_POPUP_CLASS @@ -692,9 +695,9 @@ EntangleImageStatusbar EntangleImageStatusbar EntangleImageStatusbarClass -entangle_image_statusbar_get_image entangle_image_statusbar_new entangle_image_statusbar_set_image +entangle_image_statusbar_get_image ENTANGLE_IMAGE_STATUSBAR ENTANGLE_IMAGE_STATUSBAR_CLASS @@ -708,8 +711,8 @@
entangle-pixbuf -EntanglePixbufImageSlot entangle_pixbuf_auto_rotate +EntanglePixbufImageSlot entangle_pixbuf_open_image
@@ -718,16 +721,16 @@ EntanglePixbufLoader EntanglePixbufLoader EntanglePixbufLoaderClass -entangle_pixbuf_loader_get_colour_transform -entangle_pixbuf_loader_get_metadata -entangle_pixbuf_loader_get_pixbuf -entangle_pixbuf_loader_get_workers entangle_pixbuf_loader_is_ready +entangle_pixbuf_loader_get_pixbuf +entangle_pixbuf_loader_get_metadata entangle_pixbuf_loader_load +entangle_pixbuf_loader_unload +entangle_pixbuf_loader_trigger_reload entangle_pixbuf_loader_set_colour_transform +entangle_pixbuf_loader_get_colour_transform entangle_pixbuf_loader_set_workers -entangle_pixbuf_loader_trigger_reload -entangle_pixbuf_loader_unload +entangle_pixbuf_loader_get_workers ENTANGLE_IS_PIXBUF_LOADER ENTANGLE_IS_PIXBUF_LOADER_CLASS @@ -744,48 +747,50 @@ EntanglePreferences EntanglePreferences EntanglePreferencesClass -entangle_preferences_capture_get_continuous_preview -entangle_preferences_capture_get_delete_file -entangle_preferences_capture_get_filename_pattern +entangle_preferences_new +entangle_preferences_interface_get_auto_connect +entangle_preferences_interface_set_auto_connect +entangle_preferences_interface_get_screen_blank +entangle_preferences_interface_set_screen_blank +entangle_preferences_interface_get_plugins +entangle_preferences_interface_add_plugin +entangle_preferences_interface_remove_plugin +entangle_preferences_interface_get_histogram_linear +entangle_preferences_interface_set_histogram_linear entangle_preferences_capture_get_last_session +entangle_preferences_capture_set_last_session +entangle_preferences_capture_get_filename_pattern +entangle_preferences_capture_set_filename_pattern +entangle_preferences_capture_get_continuous_preview entangle_preferences_capture_set_continuous_preview +entangle_preferences_capture_get_delete_file entangle_preferences_capture_set_delete_file -entangle_preferences_capture_set_filename_pattern -entangle_preferences_capture_set_last_session -entangle_preferences_cms_get_detect_system_profile entangle_preferences_cms_get_enabled -entangle_preferences_cms_get_monitor_profile -entangle_preferences_cms_get_rendering_intent -entangle_preferences_cms_get_rgb_profile -entangle_preferences_cms_set_detect_system_profile entangle_preferences_cms_set_enabled +entangle_preferences_cms_get_rgb_profile +entangle_preferences_cms_set_rgb_profile +entangle_preferences_cms_get_monitor_profile entangle_preferences_cms_set_monitor_profile +entangle_preferences_cms_get_detect_system_profile +entangle_preferences_cms_set_detect_system_profile +entangle_preferences_cms_get_rendering_intent entangle_preferences_cms_set_rendering_intent -entangle_preferences_cms_set_rgb_profile entangle_preferences_img_get_aspect_ratio -entangle_preferences_img_get_embedded_preview -entangle_preferences_img_get_focus_point -entangle_preferences_img_get_grid_lines -entangle_preferences_img_get_mask_enabled -entangle_preferences_img_get_mask_opacity -entangle_preferences_img_get_onion_layers -entangle_preferences_img_get_onion_skin entangle_preferences_img_set_aspect_ratio -entangle_preferences_img_set_embedded_preview +entangle_preferences_img_get_mask_opacity +entangle_preferences_img_set_mask_opacity +entangle_preferences_img_get_mask_enabled +entangle_preferences_img_set_mask_enabled +entangle_preferences_img_get_focus_point entangle_preferences_img_set_focus_point +entangle_preferences_img_get_grid_lines entangle_preferences_img_set_grid_lines -entangle_preferences_img_set_mask_enabled -entangle_preferences_img_set_mask_opacity -entangle_preferences_img_set_onion_layers +entangle_preferences_img_get_embedded_preview +entangle_preferences_img_set_embedded_preview +entangle_preferences_img_get_onion_skin entangle_preferences_img_set_onion_skin -entangle_preferences_interface_add_plugin -entangle_preferences_interface_get_auto_connect -entangle_preferences_interface_get_plugins -entangle_preferences_interface_get_screen_blank -entangle_preferences_interface_remove_plugin -entangle_preferences_interface_set_auto_connect -entangle_preferences_interface_set_screen_blank -entangle_preferences_new +entangle_preferences_img_get_onion_layers +entangle_preferences_img_set_onion_layers ENTANGLE_IS_PREFERENCES ENTANGLE_IS_PREFERENCES_CLASS @@ -802,10 +807,10 @@ EntanglePreferencesDisplay EntanglePreferencesDisplay EntanglePreferencesDisplayClass -entangle_camera_preferences_get_application -entangle_preferences_display_get_window entangle_preferences_display_new +entangle_preferences_display_get_window entangle_preferences_display_show +entangle_camera_preferences_get_application ENTANGLE_IS_PREFERENCES_DISPLAY ENTANGLE_IS_PREFERENCES_DISPLAY_CLASS @@ -822,8 +827,8 @@ EntangleProgress EntangleProgressInterface entangle_progress_start -entangle_progress_stop entangle_progress_update +entangle_progress_stop ENTANGLE_IS_PROGRESS ENTANGLE_PROGRESS @@ -837,15 +842,15 @@ EntangleSession EntangleSession EntangleSessionClass -entangle_session_add +entangle_session_new entangle_session_directory entangle_session_filename_pattern -entangle_session_image_count -entangle_session_image_get -entangle_session_load -entangle_session_new entangle_session_next_filename +entangle_session_load +entangle_session_add entangle_session_remove +entangle_session_image_count +entangle_session_image_get ENTANGLE_IS_SESSION ENTANGLE_IS_SESSION_CLASS @@ -862,14 +867,14 @@ EntangleSessionBrowser EntangleSessionBrowser EntangleSessionBrowserClass -entangle_session_browser_earlier_images -entangle_session_browser_get_image_at_coords -entangle_session_browser_get_session -entangle_session_browser_get_thumbnail_loader entangle_session_browser_new entangle_session_browser_selected_image -entangle_session_browser_set_session +entangle_session_browser_earlier_images entangle_session_browser_set_thumbnail_loader +entangle_session_browser_get_thumbnail_loader +entangle_session_browser_set_session +entangle_session_browser_get_session +entangle_session_browser_get_image_at_coords ENTANGLE_IS_SESSION_BROWSER ENTANGLE_IS_SESSION_BROWSER_CLASS @@ -903,13 +908,13 @@ ViewOvBox ViewOvBox ViewOvBoxClass -ViewOvBox_GetFraction ViewOvBox_GetType ViewOvBox_New -ViewOvBox_SetFraction -ViewOvBox_SetMin -ViewOvBox_SetOver ViewOvBox_SetUnder +ViewOvBox_SetOver +ViewOvBox_SetMin +ViewOvBox_SetFraction +ViewOvBox_GetFraction VIEW_IS_OV_BOX VIEW_IS_OV_BOX_CLASS diff -Nru entangle-0.5.1/docs/reference/Makefile.in entangle-0.5.2/docs/reference/Makefile.in --- entangle-0.5.1/docs/reference/Makefile.in 2013-03-12 21:24:37.000000000 +0000 +++ entangle-0.5.2/docs/reference/Makefile.in 2013-08-17 18:27:59.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 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, @@ -20,23 +20,51 @@ # Everything below here is generic # #################################### 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,8 +83,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gtk-doc.make +DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am subdir = docs/reference ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/entangle-compile-warnings.m4 \ @@ -91,6 +119,7 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -436,6 +465,37 @@ @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp +#### setup #### +GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) +GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build"; + +#### scan #### +GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V)) +GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN_0 = @echo " DOC Scanning header files"; +GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V)) +GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; + +#### xml #### +GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V)) +GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML_0 = @echo " DOC Building XML"; + +#### html #### +GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V)) +GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML_0 = @echo " DOC Building HTML"; +GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V)) +GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF_0 = @echo " DOC Fixing cross-references"; + +#### pdf #### +GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V)) +GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF_0 = @echo " DOC Building PDF"; + # Files not to distribute # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt @@ -484,11 +544,9 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -631,18 +689,18 @@ .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-local dist-hook distclean \ - distclean-generic distclean-libtool distclean-local distdir \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local 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 \ + clean-libtool clean-local cscopelist-am ctags-am dist-hook \ + distclean distclean-generic distclean-libtool distclean-local \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-data-local \ + 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 \ maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-local + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-local @ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) @@ -652,32 +710,25 @@ $(REPORT_FILES): sgml-build.stamp -#### setup #### - setup-build.stamp: - -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - echo ' DOC Preparing build'; \ + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ fi - @touch setup-build.stamp - -#### scan #### + $(AM_V_at)touch setup-build.stamp scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo ' DOC Scanning header files' - @_source_dir='' ; \ + $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - echo " DOC Introspecting gobjects"; \ + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ @@ -692,32 +743,25 @@ test -f $$i || touch $$i ; \ done \ fi - @touch scan-build.stamp + $(AM_V_at)touch scan-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true -#### xml #### - sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) - @echo ' DOC Building XML' - @_source_dir='' ; \ + $(GTK_DOC_V_XML)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) - @touch sgml-build.stamp + $(AM_V_at)touch sgml-build.stamp sgml.stamp: sgml-build.stamp @true -#### html #### - html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building HTML' - @rm -rf html - @mkdir html - @mkhtml_options=""; \ + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -738,16 +782,12 @@ cp $(abs_builddir)/$$file $(abs_builddir)/html; \ fi; \ done; - @echo ' DOC Fixing cross-references' - @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - @touch html-build.stamp - -#### pdf #### + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building PDF' - @rm -f $(DOC_MODULE).pdf - @mkpdf_options=""; \ + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -764,7 +804,7 @@ done; \ fi; \ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) - @touch pdf-build.stamp + $(AM_V_at)touch pdf-build.stamp ############## @@ -779,7 +819,7 @@ rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ fi -maintainer-clean-local: clean +maintainer-clean-local: @rm -rf xml html install-data-local: @@ -815,7 +855,7 @@ # # Require gtk-doc when making dist # -@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: +@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs @ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: @ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" @ENABLE_GTK_DOC_FALSE@ @false diff -Nru entangle-0.5.1/docs/reference/html/Entangle-EntangleProgress.html entangle-0.5.2/docs/reference/html/Entangle-EntangleProgress.html --- entangle-0.5.1/docs/reference/html/Entangle-EntangleProgress.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/Entangle-EntangleProgress.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleProgress - + - + @@ -41,9 +41,9 @@ void entangle_progress_start (EntangleProgress *prog, float target, const char *msg); -void entangle_progress_stop (EntangleProgress *prog); void entangle_progress_update (EntangleProgress *prog, float current); +void entangle_progress_stop (EntangleProgress *prog);
@@ -71,19 +71,19 @@
-

entangle_progress_stop ()

-
void                entangle_progress_stop              (EntangleProgress *prog);
-
-
-

entangle_progress_update ()

void                entangle_progress_update            (EntangleProgress *prog,
                                                          float current);
+
+
+

entangle_progress_stop ()

+
void                entangle_progress_stop              (EntangleProgress *prog);
+
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/Entangle-entangle-debug.html entangle-0.5.2/docs/reference/html/Entangle-entangle-debug.html --- entangle-0.5.1/docs/reference/html/Entangle-entangle-debug.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/Entangle-entangle-debug.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ entangle-debug - + - + @@ -37,13 +37,13 @@

Synopsis

-
#define             ENTANGLE_DEBUG                      (fmt,
-                                                         ...)
-extern gboolean     entangle_debug_app;
+
extern gboolean     entangle_debug_app;
 extern gboolean     entangle_debug_gphoto;
-void                entangle_debug_setup                (gboolean debug_app,
-                                                         gboolean debug_gphoto);
 extern gint64       entangle_debug_startms;
+void                entangle_debug_setup                (gboolean debug_app,
+                                                         gboolean debug_gphoto);
+#define             ENTANGLE_DEBUG                      (fmt,
+                                                         ...)
@@ -52,11 +52,6 @@

Details

-

ENTANGLE_DEBUG()

-
#define             ENTANGLE_DEBUG(fmt, ...)
-
-
-

entangle_debug_app

extern gboolean entangle_debug_app;
@@ -69,20 +64,25 @@
+

entangle_debug_startms

+
extern gint64 entangle_debug_startms;
+
+
+
+

entangle_debug_setup ()

-
void                entangle_debug_setup                (gboolean debug_app,
-                                                         gboolean debug_gphoto);
+
void                entangle_debug_setup                (gboolean debug_app,
+                                                         gboolean debug_gphoto);
-

entangle_debug_startms

-
extern gint64 entangle_debug_startms;
-
+

ENTANGLE_DEBUG()

+
#define             ENTANGLE_DEBUG(fmt, ...)
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/Entangle-entangle-dpms.html entangle-0.5.2/docs/reference/html/Entangle-entangle-dpms.html --- entangle-0.5.1/docs/reference/html/Entangle-entangle-dpms.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/Entangle-entangle-dpms.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ entangle-dpms - + - + @@ -37,8 +37,8 @@

Synopsis

-
gboolean            entangle_dpms_set_blanking          (gboolean enabled,
-                                                         GError **error);
+
gboolean            entangle_dpms_set_blanking          (gboolean enabled,
+                                                         GError **error);
@@ -48,13 +48,13 @@

Details

entangle_dpms_set_blanking ()

-
gboolean            entangle_dpms_set_blanking          (gboolean enabled,
-                                                         GError **error);
+
gboolean            entangle_dpms_set_blanking          (gboolean enabled,
+                                                         GError **error);
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/Entangle-entangle-pixbuf.html entangle-0.5.2/docs/reference/html/Entangle-entangle-pixbuf.html --- entangle-0.5.1/docs/reference/html/Entangle-entangle-pixbuf.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/Entangle-entangle-pixbuf.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ entangle-pixbuf - + - + @@ -37,10 +37,13 @@

Synopsis

-
enum                EntanglePixbufImageSlot;
-GdkPixbuf *         entangle_pixbuf_auto_rotate         (GdkPixbuf *src);
+
GdkPixbuf *         entangle_pixbuf_auto_rotate         (GdkPixbuf *src,
+                                                         GExiv2Metadata *metadata);
+enum                EntanglePixbufImageSlot;
 GdkPixbuf *         entangle_pixbuf_open_image          (EntangleImage *image,
-                                                         EntanglePixbufImageSlot slot);
+                                                         EntanglePixbufImageSlot slot,
+                                                         gboolean applyOrientation,
+                                                         GExiv2Metadata **metadata);
@@ -49,6 +52,12 @@

Details

+

entangle_pixbuf_auto_rotate ()

+
GdkPixbuf *         entangle_pixbuf_auto_rotate         (GdkPixbuf *src,
+                                                         GExiv2Metadata *metadata);
+
+
+

enum EntanglePixbufImageSlot

typedef enum {
   ENTANGLE_PIXBUF_IMAGE_SLOT_MASTER,
@@ -56,22 +65,39 @@
   ENTANGLE_PIXBUF_IMAGE_SLOT_THUMBNAIL,
 } EntanglePixbufImageSlot;
-
-
-
-

entangle_pixbuf_auto_rotate ()

-
GdkPixbuf *         entangle_pixbuf_auto_rotate         (GdkPixbuf *src);
+
++++ + + + + + + + + + + + + + + +

ENTANGLE_PIXBUF_IMAGE_SLOT_MASTER

ENTANGLE_PIXBUF_IMAGE_SLOT_PREVIEW

ENTANGLE_PIXBUF_IMAGE_SLOT_THUMBNAIL

entangle_pixbuf_open_image ()

GdkPixbuf *         entangle_pixbuf_open_image          (EntangleImage *image,
-                                                         EntanglePixbufImageSlot slot);
+ EntanglePixbufImageSlot slot, + gboolean applyOrientation, + GExiv2Metadata **metadata);
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/Entangle.devhelp2 entangle-0.5.2/docs/reference/html/Entangle.devhelp2 --- entangle-0.5.1/docs/reference/html/Entangle.devhelp2 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/Entangle.devhelp2 2013-08-17 18:28:18.000000000 +0000 @@ -6,7 +6,7 @@ - + @@ -49,59 +49,59 @@ - - - - - - + + + - - - + + + + + + + + + + - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + - - - + + + + @@ -124,14 +124,14 @@ - + - - + + @@ -139,49 +139,49 @@ - + + - + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - - - - + + + + @@ -194,10 +194,10 @@ + - @@ -205,17 +205,17 @@ + - - + + - @@ -230,49 +230,49 @@ - + - - + + - + + - - - + + - - + + - + - - - - + + + + + - - + @@ -282,48 +282,50 @@ - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + + - - - - - - - - - + + + + + + - - - + + + - - - - - - - - + + @@ -342,22 +344,23 @@ + - + - + - - - - + + + + @@ -367,55 +370,55 @@ - - + + + - - + - - + + - - - + + + - - - + + - + - - + + + - - + + @@ -424,51 +427,52 @@ - + + - - + - - + + - - + + - - - - - + + + - - + + + - - + + + + + + + + - - - - - + @@ -479,46 +483,64 @@ - + + + - - - - + + + + - + - - + + - - - - - + + + + + + + + + + + + + + + + + + + + + diff -Nru entangle-0.5.1/docs/reference/html/EntangleApplication.html entangle-0.5.2/docs/reference/html/EntangleApplication.html --- entangle-0.5.1/docs/reference/html/EntangleApplication.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleApplication.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleApplication - + - + @@ -45,20 +45,20 @@

Synopsis

struct              EntangleApplication;
 struct              EntangleApplicationClass;
+EntangleApplication * entangle_application_new          (void);
 EntangleCameraList * entangle_application_get_cameras   (EntangleApplication *application);
-PeasEngine *        entangle_application_get_plugin_engine
-                                                        (EntangleApplication *application);
 EntanglePreferences * entangle_application_get_preferences
                                                         (EntangleApplication *application);
-EntangleApplication * entangle_application_new          (void);
+PeasEngine *        entangle_application_get_plugin_engine
+                                                        (EntangleApplication *application);

Object Hierarchy

-  GObject
-   +----GApplication
-         +----GtkApplication
+  GObject
+   +----GApplication
+         +----GtkApplication
                +----EntangleApplication
@@ -66,7 +66,7 @@

Implemented Interfaces

EntangleApplication implements - GActionGroup and GActionMap.

+ GActionGroup and GActionMap.

Properties

@@ -94,14 +94,13 @@
-

entangle_application_get_cameras ()

-
EntangleCameraList * entangle_application_get_cameras   (EntangleApplication *application);
+

entangle_application_new ()

+
EntangleApplication * entangle_application_new          (void);
-

entangle_application_get_plugin_engine ()

-
PeasEngine *        entangle_application_get_plugin_engine
-                                                        (EntangleApplication *application);
+

entangle_application_get_cameras ()

+
EntangleCameraList * entangle_application_get_cameras   (EntangleApplication *application);
@@ -111,8 +110,9 @@
-

entangle_application_new ()

-
EntangleApplication * entangle_application_new          (void);
+

entangle_application_get_plugin_engine ()

+
PeasEngine *        entangle_application_get_plugin_engine
+                                                        (EntangleApplication *application);
@@ -132,6 +132,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleCamera.html entangle-0.5.2/docs/reference/html/EntangleCamera.html --- entangle-0.5.1/docs/reference/html/EntangleCamera.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleCamera.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleCamera - + - + @@ -45,203 +45,203 @@

Synopsis

struct              EntangleCamera;
 struct              EntangleCameraClass;
-gboolean            entangle_camera_autofocus           (EntangleCamera *cam,
-                                                         GError **error);
-void                entangle_camera_autofocus_async     (EntangleCamera *cam,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            entangle_camera_autofocus_finish    (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+EntangleCamera *    entangle_camera_new                 (const char *model,
+                                                         const char *port,
+                                                         gboolean hasCapture,
+                                                         gboolean hasPreview,
+                                                         gboolean hasSettings);
+const char *        entangle_camera_get_model           (EntangleCamera *cam);
+const char *        entangle_camera_get_port            (EntangleCamera *cam);
+gboolean            entangle_camera_connect             (EntangleCamera *cam,
+                                                         GError **error);
+void                entangle_camera_connect_async       (EntangleCamera *cam,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            entangle_camera_connect_finish      (EntangleCamera *cam,
+                                                         GAsyncResult *result,
+                                                         GError **error);
+gboolean            entangle_camera_disconnect          (EntangleCamera *cam,
+                                                         GError **error);
+void                entangle_camera_disconnect_async    (EntangleCamera *cam,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            entangle_camera_disconnect_finish   (EntangleCamera *cam,
+                                                         GAsyncResult *result,
+                                                         GError **error);
+gboolean            entangle_camera_get_connected       (EntangleCamera *cam);
+char *              entangle_camera_get_summary         (EntangleCamera *cam);
+char *              entangle_camera_get_manual          (EntangleCamera *cam);
+char *              entangle_camera_get_driver          (EntangleCamera *cam);
 EntangleCameraFile * entangle_camera_capture_image      (EntangleCamera *cam,
-                                                         GError **error);
+                                                         GError **error);
 void                entangle_camera_capture_image_async (EntangleCamera *cam,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
 EntangleCameraFile * entangle_camera_capture_image_finish
                                                         (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **error);
-gboolean            entangle_camera_connect             (EntangleCamera *cam,
-                                                         GError **error);
-void                entangle_camera_connect_async       (EntangleCamera *cam,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            entangle_camera_connect_finish      (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **error);
-gboolean            entangle_camera_delete_file         (EntangleCamera *cam,
-                                                         EntangleCameraFile *file,
-                                                         GError **error);
-void                entangle_camera_delete_file_async   (EntangleCamera *cam,
-                                                         EntangleCameraFile *file,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            entangle_camera_delete_file_finish  (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **error);
-gboolean            entangle_camera_disconnect          (EntangleCamera *cam,
-                                                         GError **error);
-void                entangle_camera_disconnect_async    (EntangleCamera *cam,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            entangle_camera_disconnect_finish   (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **error);
-gboolean            entangle_camera_download_file       (EntangleCamera *cam,
-                                                         EntangleCameraFile *file,
-                                                         GError **error);
-void                entangle_camera_download_file_async (EntangleCamera *cam,
-                                                         EntangleCameraFile *file,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            entangle_camera_download_file_finish
-                                                        (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **err);
-gboolean            entangle_camera_get_connected       (EntangleCamera *cam);
-EntangleControlGroup * entangle_camera_get_controls     (EntangleCamera *cam,
-                                                         GError **error);
-char *              entangle_camera_get_driver          (EntangleCamera *cam);
-gboolean            entangle_camera_get_has_capture     (EntangleCamera *cam);
-gboolean            entangle_camera_get_has_preview     (EntangleCamera *cam);
-gboolean            entangle_camera_get_has_settings    (EntangleCamera *cam);
-gboolean            entangle_camera_get_has_viewfinder  (EntangleCamera *cam);
-char *              entangle_camera_get_manual          (EntangleCamera *cam);
-const char *        entangle_camera_get_model           (EntangleCamera *cam);
-const char *        entangle_camera_get_port            (EntangleCamera *cam);
-EntangleProgress *  entangle_camera_get_progress        (EntangleCamera *cam);
-char *              entangle_camera_get_summary         (EntangleCamera *cam);
-gboolean            entangle_camera_is_mounted          (EntangleCamera *cam);
-gboolean            entangle_camera_load_controls       (EntangleCamera *cam,
-                                                         GError **error);
-void                entangle_camera_load_controls_async (EntangleCamera *cam,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            entangle_camera_load_controls_finish
-                                                        (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **error);
-gboolean            entangle_camera_manualfocus         (EntangleCamera *cam,
-                                                         gshort delta,
-                                                         GError **error);
-void                entangle_camera_manualfocus_async   (EntangleCamera *cam,
-                                                         gshort delta,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            entangle_camera_manualfocus_finish  (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **error);
-void                entangle_camera_mount_async         (EntangleCamera *cam,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            entangle_camera_mount_finish        (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **err);
-EntangleCamera *    entangle_camera_new                 (const char *model,
-                                                         const char *port,
-                                                         gboolean hasCapture,
-                                                         gboolean hasPreview,
-                                                         gboolean hasSettings);
+                                                         GAsyncResult *result,
+                                                         GError **error);
 EntangleCameraFile * entangle_camera_preview_image      (EntangleCamera *cam,
-                                                         GError **error);
+                                                         GError **error);
 void                entangle_camera_preview_image_async (EntangleCamera *cam,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
 EntangleCameraFile * entangle_camera_preview_image_finish
                                                         (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **error);
-gboolean            entangle_camera_process_events      (EntangleCamera *cam,
-                                                         guint64 waitms,
-                                                         GError **error);
+                                                         GAsyncResult *result,
+                                                         GError **error);
+gboolean            entangle_camera_download_file       (EntangleCamera *cam,
+                                                         EntangleCameraFile *file,
+                                                         GError **error);
+void                entangle_camera_download_file_async (EntangleCamera *cam,
+                                                         EntangleCameraFile *file,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            entangle_camera_download_file_finish
+                                                        (EntangleCamera *cam,
+                                                         GAsyncResult *result,
+                                                         GError **err);
+gboolean            entangle_camera_delete_file         (EntangleCamera *cam,
+                                                         EntangleCameraFile *file,
+                                                         GError **error);
+void                entangle_camera_delete_file_async   (EntangleCamera *cam,
+                                                         EntangleCameraFile *file,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            entangle_camera_delete_file_finish  (EntangleCamera *cam,
+                                                         GAsyncResult *result,
+                                                         GError **error);
+gboolean            entangle_camera_process_events      (EntangleCamera *cam,
+                                                         guint64 waitms,
+                                                         GError **error);
 void                entangle_camera_process_events_async
                                                         (EntangleCamera *cam,
-                                                         guint64 waitms,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            entangle_camera_process_events_finish
-                                                        (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **error);
-gboolean            entangle_camera_save_controls       (EntangleCamera *cam,
-                                                         GError **error);
+                                                         guint64 waitms,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            entangle_camera_process_events_finish
+                                                        (EntangleCamera *cam,
+                                                         GAsyncResult *result,
+                                                         GError **error);
+gboolean            entangle_camera_set_viewfinder      (EntangleCamera *cam,
+                                                         gboolean enabled,
+                                                         GError **error);
+void                entangle_camera_set_viewfinder_async
+                                                        (EntangleCamera *cam,
+                                                         gboolean enabled,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            entangle_camera_set_viewfinder_finish
+                                                        (EntangleCamera *cam,
+                                                         GAsyncResult *result,
+                                                         GError **error);
+gboolean            entangle_camera_autofocus           (EntangleCamera *cam,
+                                                         GError **error);
+void                entangle_camera_autofocus_async     (EntangleCamera *cam,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            entangle_camera_autofocus_finish    (EntangleCamera *cam,
+                                                         GAsyncResult *result,
+                                                         GError **error);
+gboolean            entangle_camera_manualfocus         (EntangleCamera *cam,
+                                                         gshort delta,
+                                                         GError **error);
+void                entangle_camera_manualfocus_async   (EntangleCamera *cam,
+                                                         gshort delta,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            entangle_camera_manualfocus_finish  (EntangleCamera *cam,
+                                                         GAsyncResult *result,
+                                                         GError **error);
+gboolean            entangle_camera_get_has_capture     (EntangleCamera *cam);
+gboolean            entangle_camera_get_has_preview     (EntangleCamera *cam);
+gboolean            entangle_camera_get_has_settings    (EntangleCamera *cam);
+gboolean            entangle_camera_get_has_viewfinder  (EntangleCamera *cam);
+gboolean            entangle_camera_load_controls       (EntangleCamera *cam,
+                                                         GError **error);
+void                entangle_camera_load_controls_async (EntangleCamera *cam,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            entangle_camera_load_controls_finish
+                                                        (EntangleCamera *cam,
+                                                         GAsyncResult *result,
+                                                         GError **error);
+gboolean            entangle_camera_save_controls       (EntangleCamera *cam,
+                                                         GError **error);
 void                entangle_camera_save_controls_async (EntangleCamera *cam,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            entangle_camera_save_controls_finish
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            entangle_camera_save_controls_finish
                                                         (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+                                                         GAsyncResult *result,
+                                                         GError **error);
+EntangleControlGroup * entangle_camera_get_controls     (EntangleCamera *cam,
+                                                         GError **error);
 void                entangle_camera_set_progress        (EntangleCamera *cam,
                                                          EntangleProgress *prog);
-gboolean            entangle_camera_set_viewfinder      (EntangleCamera *cam,
-                                                         gboolean enabled,
-                                                         GError **error);
-void                entangle_camera_set_viewfinder_async
-                                                        (EntangleCamera *cam,
-                                                         gboolean enabled,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            entangle_camera_set_viewfinder_finish
-                                                        (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+EntangleProgress *  entangle_camera_get_progress        (EntangleCamera *cam);
+gboolean            entangle_camera_is_mounted          (EntangleCamera *cam);
+void                entangle_camera_mount_async         (EntangleCamera *cam,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            entangle_camera_mount_finish        (EntangleCamera *cam,
+                                                         GAsyncResult *result,
+                                                         GError **err);
 void                entangle_camera_unmount_async       (EntangleCamera *cam,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            entangle_camera_unmount_finish      (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **err);
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            entangle_camera_unmount_finish      (EntangleCamera *cam,
+                                                         GAsyncResult *result,
+                                                         GError **err);

Object Hierarchy

-  GObject
+  GObject
    +----EntangleCamera

Properties

-  "driver"                   gchar*                : Read
-  "has-capture"              gboolean              : Read / Write / Construct Only
-  "has-preview"              gboolean              : Read / Write / Construct Only
-  "has-settings"             gboolean              : Read / Write / Construct Only
-  "has-viewfinder"           gboolean              : Read / Write / Construct Only
-  "manual"                   gchar*                : Read
-  "model"                    gchar*                : Read / Write / Construct Only
-  "port"                     gchar*                : Read / Write / Construct Only
+  "driver"                   gchar*                : Read
+  "has-capture"              gboolean              : Read / Write / Construct Only
+  "has-preview"              gboolean              : Read / Write / Construct Only
+  "has-settings"             gboolean              : Read / Write / Construct Only
+  "has-viewfinder"           gboolean              : Read / Write / Construct Only
+  "manual"                   gchar*                : Read
+  "model"                    gchar*                : Read / Write / Construct Only
+  "port"                     gchar*                : Read / Write / Construct Only
   "progress"                 EntangleProgress*     : Read / Write
-  "summary"                  gchar*                : Read
+  "summary"                  gchar*                : Read

Signals

-  "camera-connected"                               : Run First
-  "camera-controls-changed"                        : Run First
-  "camera-disconnected"                            : Run First
-  "camera-file-added"                              : Run First
-  "camera-file-captured"                           : Run First
-  "camera-file-deleted"                            : Run First
-  "camera-file-downloaded"                         : Run First
-  "camera-file-previewed"                          : Run First
+  "camera-connected"                               : Run First
+  "camera-controls-changed"                        : Run First
+  "camera-disconnected"                            : Run First
+  "camera-file-added"                              : Run First
+  "camera-file-captured"                           : Run First
+  "camera-file-deleted"                            : Run First
+  "camera-file-downloaded"                         : Run First
+  "camera-file-previewed"                          : Run First
@@ -274,339 +274,339 @@
-

entangle_camera_autofocus ()

-
gboolean            entangle_camera_autofocus           (EntangleCamera *cam,
-                                                         GError **error);
+

entangle_camera_new ()

+
EntangleCamera *    entangle_camera_new                 (const char *model,
+                                                         const char *port,
+                                                         gboolean hasCapture,
+                                                         gboolean hasPreview,
+                                                         gboolean hasSettings);
-

entangle_camera_autofocus_async ()

-
void                entangle_camera_autofocus_async     (EntangleCamera *cam,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+

entangle_camera_get_model ()

+
const char *        entangle_camera_get_model           (EntangleCamera *cam);
-

entangle_camera_autofocus_finish ()

-
gboolean            entangle_camera_autofocus_finish    (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+

entangle_camera_get_port ()

+
const char *        entangle_camera_get_port            (EntangleCamera *cam);
-

entangle_camera_capture_image ()

-
EntangleCameraFile * entangle_camera_capture_image      (EntangleCamera *cam,
-                                                         GError **error);
+

entangle_camera_connect ()

+
gboolean            entangle_camera_connect             (EntangleCamera *cam,
+                                                         GError **error);
-

entangle_camera_capture_image_async ()

-
void                entangle_camera_capture_image_async (EntangleCamera *cam,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+

entangle_camera_connect_async ()

+
void                entangle_camera_connect_async       (EntangleCamera *cam,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
-

entangle_camera_capture_image_finish ()

-
EntangleCameraFile * entangle_camera_capture_image_finish
-                                                        (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+

entangle_camera_connect_finish ()

+
gboolean            entangle_camera_connect_finish      (EntangleCamera *cam,
+                                                         GAsyncResult *result,
+                                                         GError **error);
-

entangle_camera_connect ()

-
gboolean            entangle_camera_connect             (EntangleCamera *cam,
-                                                         GError **error);
+

entangle_camera_disconnect ()

+
gboolean            entangle_camera_disconnect          (EntangleCamera *cam,
+                                                         GError **error);
-

entangle_camera_connect_async ()

-
void                entangle_camera_connect_async       (EntangleCamera *cam,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+

entangle_camera_disconnect_async ()

+
void                entangle_camera_disconnect_async    (EntangleCamera *cam,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
-

entangle_camera_connect_finish ()

-
gboolean            entangle_camera_connect_finish      (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+

entangle_camera_disconnect_finish ()

+
gboolean            entangle_camera_disconnect_finish   (EntangleCamera *cam,
+                                                         GAsyncResult *result,
+                                                         GError **error);
-

entangle_camera_delete_file ()

-
gboolean            entangle_camera_delete_file         (EntangleCamera *cam,
-                                                         EntangleCameraFile *file,
-                                                         GError **error);
+

entangle_camera_get_connected ()

+
gboolean            entangle_camera_get_connected       (EntangleCamera *cam);
-

entangle_camera_delete_file_async ()

-
void                entangle_camera_delete_file_async   (EntangleCamera *cam,
-                                                         EntangleCameraFile *file,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+

entangle_camera_get_summary ()

+
char *              entangle_camera_get_summary         (EntangleCamera *cam);
-

entangle_camera_delete_file_finish ()

-
gboolean            entangle_camera_delete_file_finish  (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+

entangle_camera_get_manual ()

+
char *              entangle_camera_get_manual          (EntangleCamera *cam);
-

entangle_camera_disconnect ()

-
gboolean            entangle_camera_disconnect          (EntangleCamera *cam,
-                                                         GError **error);
+

entangle_camera_get_driver ()

+
char *              entangle_camera_get_driver          (EntangleCamera *cam);
-

entangle_camera_disconnect_async ()

-
void                entangle_camera_disconnect_async    (EntangleCamera *cam,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+

entangle_camera_capture_image ()

+
EntangleCameraFile * entangle_camera_capture_image      (EntangleCamera *cam,
+                                                         GError **error);
-

entangle_camera_disconnect_finish ()

-
gboolean            entangle_camera_disconnect_finish   (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+

entangle_camera_capture_image_async ()

+
void                entangle_camera_capture_image_async (EntangleCamera *cam,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
-

entangle_camera_download_file ()

-
gboolean            entangle_camera_download_file       (EntangleCamera *cam,
-                                                         EntangleCameraFile *file,
-                                                         GError **error);
+

entangle_camera_capture_image_finish ()

+
EntangleCameraFile * entangle_camera_capture_image_finish
+                                                        (EntangleCamera *cam,
+                                                         GAsyncResult *result,
+                                                         GError **error);
-

entangle_camera_download_file_async ()

-
void                entangle_camera_download_file_async (EntangleCamera *cam,
-                                                         EntangleCameraFile *file,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+

entangle_camera_preview_image ()

+
EntangleCameraFile * entangle_camera_preview_image      (EntangleCamera *cam,
+                                                         GError **error);
-

entangle_camera_download_file_finish ()

-
gboolean            entangle_camera_download_file_finish
-                                                        (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **err);
+

entangle_camera_preview_image_async ()

+
void                entangle_camera_preview_image_async (EntangleCamera *cam,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
-

entangle_camera_get_connected ()

-
gboolean            entangle_camera_get_connected       (EntangleCamera *cam);
+

entangle_camera_preview_image_finish ()

+
EntangleCameraFile * entangle_camera_preview_image_finish
+                                                        (EntangleCamera *cam,
+                                                         GAsyncResult *result,
+                                                         GError **error);
-

entangle_camera_get_controls ()

-
EntangleControlGroup * entangle_camera_get_controls     (EntangleCamera *cam,
-                                                         GError **error);
+

entangle_camera_download_file ()

+
gboolean            entangle_camera_download_file       (EntangleCamera *cam,
+                                                         EntangleCameraFile *file,
+                                                         GError **error);
-

entangle_camera_get_driver ()

-
char *              entangle_camera_get_driver          (EntangleCamera *cam);
+

entangle_camera_download_file_async ()

+
void                entangle_camera_download_file_async (EntangleCamera *cam,
+                                                         EntangleCameraFile *file,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
-

entangle_camera_get_has_capture ()

-
gboolean            entangle_camera_get_has_capture     (EntangleCamera *cam);
+

entangle_camera_download_file_finish ()

+
gboolean            entangle_camera_download_file_finish
+                                                        (EntangleCamera *cam,
+                                                         GAsyncResult *result,
+                                                         GError **err);
-

entangle_camera_get_has_preview ()

-
gboolean            entangle_camera_get_has_preview     (EntangleCamera *cam);
+

entangle_camera_delete_file ()

+
gboolean            entangle_camera_delete_file         (EntangleCamera *cam,
+                                                         EntangleCameraFile *file,
+                                                         GError **error);
-

entangle_camera_get_has_settings ()

-
gboolean            entangle_camera_get_has_settings    (EntangleCamera *cam);
+

entangle_camera_delete_file_async ()

+
void                entangle_camera_delete_file_async   (EntangleCamera *cam,
+                                                         EntangleCameraFile *file,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
-

entangle_camera_get_has_viewfinder ()

-
gboolean            entangle_camera_get_has_viewfinder  (EntangleCamera *cam);
+

entangle_camera_delete_file_finish ()

+
gboolean            entangle_camera_delete_file_finish  (EntangleCamera *cam,
+                                                         GAsyncResult *result,
+                                                         GError **error);
-

entangle_camera_get_manual ()

-
char *              entangle_camera_get_manual          (EntangleCamera *cam);
+

entangle_camera_process_events ()

+
gboolean            entangle_camera_process_events      (EntangleCamera *cam,
+                                                         guint64 waitms,
+                                                         GError **error);
-

entangle_camera_get_model ()

-
const char *        entangle_camera_get_model           (EntangleCamera *cam);
+

entangle_camera_process_events_async ()

+
void                entangle_camera_process_events_async
+                                                        (EntangleCamera *cam,
+                                                         guint64 waitms,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
-

entangle_camera_get_port ()

-
const char *        entangle_camera_get_port            (EntangleCamera *cam);
+

entangle_camera_process_events_finish ()

+
gboolean            entangle_camera_process_events_finish
+                                                        (EntangleCamera *cam,
+                                                         GAsyncResult *result,
+                                                         GError **error);
-

entangle_camera_get_progress ()

-
EntangleProgress *  entangle_camera_get_progress        (EntangleCamera *cam);
+

entangle_camera_set_viewfinder ()

+
gboolean            entangle_camera_set_viewfinder      (EntangleCamera *cam,
+                                                         gboolean enabled,
+                                                         GError **error);
-

entangle_camera_get_summary ()

-
char *              entangle_camera_get_summary         (EntangleCamera *cam);
+

entangle_camera_set_viewfinder_async ()

+
void                entangle_camera_set_viewfinder_async
+                                                        (EntangleCamera *cam,
+                                                         gboolean enabled,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
-

entangle_camera_is_mounted ()

-
gboolean            entangle_camera_is_mounted          (EntangleCamera *cam);
+

entangle_camera_set_viewfinder_finish ()

+
gboolean            entangle_camera_set_viewfinder_finish
+                                                        (EntangleCamera *cam,
+                                                         GAsyncResult *result,
+                                                         GError **error);
-

entangle_camera_load_controls ()

-
gboolean            entangle_camera_load_controls       (EntangleCamera *cam,
-                                                         GError **error);
+

entangle_camera_autofocus ()

+
gboolean            entangle_camera_autofocus           (EntangleCamera *cam,
+                                                         GError **error);
-

entangle_camera_load_controls_async ()

-
void                entangle_camera_load_controls_async (EntangleCamera *cam,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+

entangle_camera_autofocus_async ()

+
void                entangle_camera_autofocus_async     (EntangleCamera *cam,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
-

entangle_camera_load_controls_finish ()

-
gboolean            entangle_camera_load_controls_finish
-                                                        (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+

entangle_camera_autofocus_finish ()

+
gboolean            entangle_camera_autofocus_finish    (EntangleCamera *cam,
+                                                         GAsyncResult *result,
+                                                         GError **error);

entangle_camera_manualfocus ()

-
gboolean            entangle_camera_manualfocus         (EntangleCamera *cam,
-                                                         gshort delta,
-                                                         GError **error);
+
gboolean            entangle_camera_manualfocus         (EntangleCamera *cam,
+                                                         gshort delta,
+                                                         GError **error);

entangle_camera_manualfocus_async ()

void                entangle_camera_manualfocus_async   (EntangleCamera *cam,
-                                                         gshort delta,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ gshort delta, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

entangle_camera_manualfocus_finish ()

-
gboolean            entangle_camera_manualfocus_finish  (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **error);
-
-
-
-

entangle_camera_mount_async ()

-
void                entangle_camera_mount_async         (EntangleCamera *cam,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+
gboolean            entangle_camera_manualfocus_finish  (EntangleCamera *cam,
+                                                         GAsyncResult *result,
+                                                         GError **error);
-

entangle_camera_mount_finish ()

-
gboolean            entangle_camera_mount_finish        (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **err);
-
-
-
-

entangle_camera_new ()

-
EntangleCamera *    entangle_camera_new                 (const char *model,
-                                                         const char *port,
-                                                         gboolean hasCapture,
-                                                         gboolean hasPreview,
-                                                         gboolean hasSettings);
+

entangle_camera_get_has_capture ()

+
gboolean            entangle_camera_get_has_capture     (EntangleCamera *cam);
-

entangle_camera_preview_image ()

-
EntangleCameraFile * entangle_camera_preview_image      (EntangleCamera *cam,
-                                                         GError **error);
+

entangle_camera_get_has_preview ()

+
gboolean            entangle_camera_get_has_preview     (EntangleCamera *cam);
-

entangle_camera_preview_image_async ()

-
void                entangle_camera_preview_image_async (EntangleCamera *cam,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+

entangle_camera_get_has_settings ()

+
gboolean            entangle_camera_get_has_settings    (EntangleCamera *cam);
-

entangle_camera_preview_image_finish ()

-
EntangleCameraFile * entangle_camera_preview_image_finish
-                                                        (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+

entangle_camera_get_has_viewfinder ()

+
gboolean            entangle_camera_get_has_viewfinder  (EntangleCamera *cam);
-

entangle_camera_process_events ()

-
gboolean            entangle_camera_process_events      (EntangleCamera *cam,
-                                                         guint64 waitms,
-                                                         GError **error);
+

entangle_camera_load_controls ()

+
gboolean            entangle_camera_load_controls       (EntangleCamera *cam,
+                                                         GError **error);
-

entangle_camera_process_events_async ()

-
void                entangle_camera_process_events_async
-                                                        (EntangleCamera *cam,
-                                                         guint64 waitms,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+

entangle_camera_load_controls_async ()

+
void                entangle_camera_load_controls_async (EntangleCamera *cam,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
-

entangle_camera_process_events_finish ()

-
gboolean            entangle_camera_process_events_finish
+
entangle_camera_load_controls_finish ()

+
gboolean            entangle_camera_load_controls_finish
                                                         (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **error);

+                                                         GAsyncResult *result,
+                                                         GError **error);

entangle_camera_save_controls ()

-
gboolean            entangle_camera_save_controls       (EntangleCamera *cam,
-                                                         GError **error);
+
gboolean            entangle_camera_save_controls       (EntangleCamera *cam,
+                                                         GError **error);

entangle_camera_save_controls_async ()

void                entangle_camera_save_controls_async (EntangleCamera *cam,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

entangle_camera_save_controls_finish ()

-
gboolean            entangle_camera_save_controls_finish
+
gboolean            entangle_camera_save_controls_finish
                                                         (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **error);

+                                                         GAsyncResult *result,
+                                                         GError **error);
+
+
+
+

entangle_camera_get_controls ()

+
EntangleControlGroup * entangle_camera_get_controls     (EntangleCamera *cam,
+                                                         GError **error);
@@ -616,99 +616,99 @@
-

entangle_camera_set_viewfinder ()

-
gboolean            entangle_camera_set_viewfinder      (EntangleCamera *cam,
-                                                         gboolean enabled,
-                                                         GError **error);
+

entangle_camera_get_progress ()

+
EntangleProgress *  entangle_camera_get_progress        (EntangleCamera *cam);
-

entangle_camera_set_viewfinder_async ()

-
void                entangle_camera_set_viewfinder_async
-                                                        (EntangleCamera *cam,
-                                                         gboolean enabled,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+

entangle_camera_is_mounted ()

+
gboolean            entangle_camera_is_mounted          (EntangleCamera *cam);
-

entangle_camera_set_viewfinder_finish ()

-
gboolean            entangle_camera_set_viewfinder_finish
-                                                        (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+

entangle_camera_mount_async ()

+
void                entangle_camera_mount_async         (EntangleCamera *cam,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+
+
+
+

entangle_camera_mount_finish ()

+
gboolean            entangle_camera_mount_finish        (EntangleCamera *cam,
+                                                         GAsyncResult *result,
+                                                         GError **err);

entangle_camera_unmount_async ()

void                entangle_camera_unmount_async       (EntangleCamera *cam,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

entangle_camera_unmount_finish ()

-
gboolean            entangle_camera_unmount_finish      (EntangleCamera *cam,
-                                                         GAsyncResult *result,
-                                                         GError **err);
+
gboolean            entangle_camera_unmount_finish      (EntangleCamera *cam,
+                                                         GAsyncResult *result,
+                                                         GError **err);

Property Details

The "driver" property

-
  "driver"                   gchar*                : Read
+
  "driver"                   gchar*                : Read

Camera driver information.

Default value: NULL

The "has-capture" property

-
  "has-capture"              gboolean              : Read / Write / Construct Only
+
  "has-capture"              gboolean              : Read / Write / Construct Only

Whether image capture is supported.

Default value: FALSE

The "has-preview" property

-
  "has-preview"              gboolean              : Read / Write / Construct Only
+
  "has-preview"              gboolean              : Read / Write / Construct Only

Whether image preview is supported.

Default value: FALSE

The "has-settings" property

-
  "has-settings"             gboolean              : Read / Write / Construct Only
+
  "has-settings"             gboolean              : Read / Write / Construct Only

Whether camera settings configuration is supported.

Default value: FALSE

The "has-viewfinder" property

-
  "has-viewfinder"           gboolean              : Read / Write / Construct Only
+
  "has-viewfinder"           gboolean              : Read / Write / Construct Only

Whether camera viewfinder configuration is supported.

Default value: FALSE

The "manual" property

-
  "manual"                   gchar*                : Read
+
  "manual"                   gchar*                : Read

Camera manual.

Default value: NULL

The "model" property

-
  "model"                    gchar*                : Read / Write / Construct Only
+
  "model"                    gchar*                : Read / Write / Construct Only

Model name of the camera.

Default value: NULL

The "port" property

-
  "port"                     gchar*                : Read / Write / Construct Only
+
  "port"                     gchar*                : Read / Write / Construct Only

Device port of the camera.

Default value: NULL

@@ -721,7 +721,7 @@

The "summary" property

-
  "summary"                  gchar*                : Read
+
  "summary"                  gchar*                : Read

Camera summary.

Default value: NULL

@@ -731,59 +731,59 @@

The "camera-connected" signal

void                user_function                      (EntangleCamera *entanglecamera,
-                                                        gpointer        user_data)           : Run First
+ gpointer user_data) : Run First

The "camera-controls-changed" signal

void                user_function                      (EntangleCamera *entanglecamera,
-                                                        gpointer        user_data)           : Run First
+ gpointer user_data) : Run First

The "camera-disconnected" signal

void                user_function                      (EntangleCamera *entanglecamera,
-                                                        gpointer        user_data)           : Run First
+ gpointer user_data) : Run First

The "camera-file-added" signal

void                user_function                      (EntangleCamera     *entanglecamera,
                                                         EntangleCameraFile *arg1,
-                                                        gpointer            user_data)           : Run First
+ gpointer user_data) : Run First

The "camera-file-captured" signal

void                user_function                      (EntangleCamera     *entanglecamera,
                                                         EntangleCameraFile *arg1,
-                                                        gpointer            user_data)           : Run First
+ gpointer user_data) : Run First

The "camera-file-deleted" signal

void                user_function                      (EntangleCamera     *entanglecamera,
                                                         EntangleCameraFile *arg1,
-                                                        gpointer            user_data)           : Run First
+ gpointer user_data) : Run First

The "camera-file-downloaded" signal

void                user_function                      (EntangleCamera     *entanglecamera,
                                                         EntangleCameraFile *arg1,
-                                                        gpointer            user_data)           : Run First
+ gpointer user_data) : Run First

The "camera-file-previewed" signal

void                user_function                      (EntangleCamera     *entanglecamera,
                                                         EntangleCameraFile *arg1,
-                                                        gpointer            user_data)           : Run First
+ gpointer user_data) : Run First
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleCameraFile.html entangle-0.5.2/docs/reference/html/EntangleCameraFile.html --- entangle-0.5.1/docs/reference/html/EntangleCameraFile.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleCameraFile.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleCameraFile - + - + @@ -43,38 +43,38 @@

Synopsis

struct              EntangleCameraFile;
 struct              EntangleCameraFileClass;
-GByteArray *        entangle_camera_file_get_data       (EntangleCameraFile *file);
-const char *        entangle_camera_file_get_folder     (EntangleCameraFile *file);
-const gchar *       entangle_camera_file_get_mimetype   (EntangleCameraFile *file);
-const char *        entangle_camera_file_get_name       (EntangleCameraFile *file);
 EntangleCameraFile * entangle_camera_file_new           (const char *folder,
                                                          const char *name);
-gboolean            entangle_camera_file_save_path      (EntangleCameraFile *file,
+const char *        entangle_camera_file_get_folder     (EntangleCameraFile *file);
+const char *        entangle_camera_file_get_name       (EntangleCameraFile *file);
+gboolean            entangle_camera_file_save_path      (EntangleCameraFile *file,
                                                          const char *localpath,
-                                                         GError **err);
-gboolean            entangle_camera_file_save_uri       (EntangleCameraFile *file,
+                                                         GError **err);
+gboolean            entangle_camera_file_save_uri       (EntangleCameraFile *file,
                                                          const char *uri,
-                                                         GError **err);
+                                                         GError **err);
+GByteArray *        entangle_camera_file_get_data       (EntangleCameraFile *file);
 void                entangle_camera_file_set_data       (EntangleCameraFile *file,
-                                                         GByteArray *data);
+                                                         GByteArray *data);
+const gchar *       entangle_camera_file_get_mimetype   (EntangleCameraFile *file);
 void                entangle_camera_file_set_mimetype   (EntangleCameraFile *file,
-                                                         const gchar *mimetype);
+                                                         const gchar *mimetype);

Object Hierarchy

-  GObject
+  GObject
    +----EntangleCameraFile

Properties

-  "data"                     GByteArray*           : Read / Write
-  "folder"                   gchar*                : Read / Write / Construct Only
-  "mimetype"                 gchar*                : Read / Write
-  "name"                     gchar*                : Read / Write / Construct Only
+  "data"                     GByteArray*           : Read / Write
+  "folder"                   gchar*                : Read / Write / Construct Only
+  "mimetype"                 gchar*                : Read / Write
+  "name"                     gchar*                : Read / Write / Construct Only
@@ -96,8 +96,9 @@
-

entangle_camera_file_get_data ()

-
GByteArray *        entangle_camera_file_get_data       (EntangleCameraFile *file);
+

entangle_camera_file_new ()

+
EntangleCameraFile * entangle_camera_file_new           (const char *folder,
+                                                         const char *name);
@@ -106,72 +107,71 @@
-

entangle_camera_file_get_mimetype ()

-
const gchar *       entangle_camera_file_get_mimetype   (EntangleCameraFile *file);
-
-
-

entangle_camera_file_get_name ()

const char *        entangle_camera_file_get_name       (EntangleCameraFile *file);
-

entangle_camera_file_new ()

-
EntangleCameraFile * entangle_camera_file_new           (const char *folder,
-                                                         const char *name);
-
-
-

entangle_camera_file_save_path ()

-
gboolean            entangle_camera_file_save_path      (EntangleCameraFile *file,
+
gboolean            entangle_camera_file_save_path      (EntangleCameraFile *file,
                                                          const char *localpath,
-                                                         GError **err);

+                                                         GError **err);

entangle_camera_file_save_uri ()

-
gboolean            entangle_camera_file_save_uri       (EntangleCameraFile *file,
+
gboolean            entangle_camera_file_save_uri       (EntangleCameraFile *file,
                                                          const char *uri,
-                                                         GError **err);

+                                                         GError **err);
+
+
+
+

entangle_camera_file_get_data ()

+
GByteArray *        entangle_camera_file_get_data       (EntangleCameraFile *file);

entangle_camera_file_set_data ()

void                entangle_camera_file_set_data       (EntangleCameraFile *file,
-                                                         GByteArray *data);
+ GByteArray *data); +
+
+
+

entangle_camera_file_get_mimetype ()

+
const gchar *       entangle_camera_file_get_mimetype   (EntangleCameraFile *file);

entangle_camera_file_set_mimetype ()

void                entangle_camera_file_set_mimetype   (EntangleCameraFile *file,
-                                                         const gchar *mimetype);
+ const gchar *mimetype);

Property Details

The "data" property

-
  "data"                     GByteArray*           : Read / Write
+
  "data"                     GByteArray*           : Read / Write

Raw data for the file.

The "folder" property

-
  "folder"                   gchar*                : Read / Write / Construct Only
+
  "folder"                   gchar*                : Read / Write / Construct Only

Folder name on the camera.

Default value: NULL

The "mimetype" property

-
  "mimetype"                 gchar*                : Read / Write
+
  "mimetype"                 gchar*                : Read / Write

File mimetype on the camera.

Default value: NULL

The "name" property

-
  "name"                     gchar*                : Read / Write / Construct Only
+
  "name"                     gchar*                : Read / Write / Construct Only

File name on the camera.

Default value: NULL

@@ -179,6 +179,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleCameraInfo.html entangle-0.5.2/docs/reference/html/EntangleCameraInfo.html --- entangle-0.5.1/docs/reference/html/EntangleCameraInfo.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleCameraInfo.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleCameraInfo - + - + @@ -46,23 +46,23 @@ 
struct              EntangleCameraInfo;
 struct              EntangleCameraInfoClass;
 enum                EntangleCameraInfoData;
-EntangleCamera *    entangle_camera_info_get_camera     (EntangleCameraInfo *info);
-EntangleCameraInfoData entangle_camera_info_get_data    (EntangleCameraInfo *info);
-GtkWindow *         entangle_camera_info_get_window     (EntangleCameraInfo *info);
-void                entangle_camera_info_hide           (EntangleCameraInfo *info);
 EntangleCameraInfo * entangle_camera_info_new           (EntangleCamera *camera,
                                                          EntangleCameraInfoData data);
-void                entangle_camera_info_set_camera     (EntangleCameraInfo *info,
-                                                         EntangleCamera *camera);
+GtkWindow *         entangle_camera_info_get_window     (EntangleCameraInfo *info);
+void                entangle_camera_info_show           (EntangleCameraInfo *info);
+void                entangle_camera_info_hide           (EntangleCameraInfo *info);
 void                entangle_camera_info_set_data       (EntangleCameraInfo *info,
                                                          EntangleCameraInfoData data);
-void                entangle_camera_info_show           (EntangleCameraInfo *info);
+EntangleCameraInfoData entangle_camera_info_get_data    (EntangleCameraInfo *info);
+void                entangle_camera_info_set_camera     (EntangleCameraInfo *info,
+                                                         EntangleCamera *camera);
+EntangleCamera *    entangle_camera_info_get_camera     (EntangleCameraInfo *info);

Object Hierarchy

-  GObject
+  GObject
    +----EntangleCameraInfo
 
@@ -80,7 +80,7 @@
 

 
Signals

 
-  "info-close"                                     : Run First
+  "info-close"                                     : Run First
 

 

 

@@ -111,21 +111,42 @@
     ENTANGLE_CAMERA_INFO_DATA_DRIVER,
 } EntangleCameraInfoData;
+
++++ + + + + + + + + + + + + + + +

ENTANGLE_CAMERA_INFO_DATA_SUMMARY

ENTANGLE_CAMERA_INFO_DATA_MANUAL

ENTANGLE_CAMERA_INFO_DATA_DRIVER

-

entangle_camera_info_get_camera ()

-
EntangleCamera *    entangle_camera_info_get_camera     (EntangleCameraInfo *info);
+

entangle_camera_info_new ()

+
EntangleCameraInfo * entangle_camera_info_new           (EntangleCamera *camera,
+                                                         EntangleCameraInfoData data);
-

entangle_camera_info_get_data ()

-
EntangleCameraInfoData entangle_camera_info_get_data    (EntangleCameraInfo *info);
+

entangle_camera_info_get_window ()

+
GtkWindow *         entangle_camera_info_get_window     (EntangleCameraInfo *info);
-

entangle_camera_info_get_window ()

-
GtkWindow *         entangle_camera_info_get_window     (EntangleCameraInfo *info);
+

entangle_camera_info_show ()

+
void                entangle_camera_info_show           (EntangleCameraInfo *info);
@@ -134,26 +155,25 @@
-

entangle_camera_info_new ()

-
EntangleCameraInfo * entangle_camera_info_new           (EntangleCamera *camera,
+
entangle_camera_info_set_data ()

+
void                entangle_camera_info_set_data       (EntangleCameraInfo *info,
                                                          EntangleCameraInfoData data);
-

entangle_camera_info_set_camera ()

-
void                entangle_camera_info_set_camera     (EntangleCameraInfo *info,
-                                                         EntangleCamera *camera);
+

entangle_camera_info_get_data ()

+
EntangleCameraInfoData entangle_camera_info_get_data    (EntangleCameraInfo *info);
-

entangle_camera_info_set_data ()

-
void                entangle_camera_info_set_data       (EntangleCameraInfo *info,
-                                                         EntangleCameraInfoData data);
+

entangle_camera_info_set_camera ()

+
void                entangle_camera_info_set_camera     (EntangleCameraInfo *info,
+                                                         EntangleCamera *camera);
-

entangle_camera_info_show ()

-
void                entangle_camera_info_show           (EntangleCameraInfo *info);
+

entangle_camera_info_get_camera ()

+
EntangleCamera *    entangle_camera_info_get_camera     (EntangleCameraInfo *info);
@@ -176,12 +196,12 @@

The "info-close" signal

void                user_function                      (EntangleCameraInfo *entanglecamerainfo,
-                                                        gpointer            user_data)               : Run First
+ gpointer user_data) : Run First
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleCameraList.html entangle-0.5.2/docs/reference/html/EntangleCameraList.html --- entangle-0.5.1/docs/reference/html/EntangleCameraList.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleCameraList.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleCameraList - + - - + + @@ -18,7 +18,7 @@ Up Home Entangle Reference Manual -Next +Next Top @@ -45,26 +45,26 @@

Synopsis

struct              EntangleCameraList;
 struct              EntangleCameraListClass;
+EntangleCameraList * entangle_camera_list_new           (void);
+gboolean            entangle_camera_list_refresh        (EntangleCameraList *list,
+                                                         GError **error);
+int                 entangle_camera_list_count          (EntangleCameraList *list);
 void                entangle_camera_list_add            (EntangleCameraList *list,
                                                          EntangleCamera *cam);
-int                 entangle_camera_list_count          (EntangleCameraList *list);
-EntangleCamera *    entangle_camera_list_find           (EntangleCameraList *list,
-                                                         const char *port);
-EntangleCamera *    entangle_camera_list_get            (EntangleCameraList *list,
-                                                         int entry);
-GList *             entangle_camera_list_get_cameras    (EntangleCameraList *list);
-gchar **            entangle_camera_list_get_supported  (EntangleCameraList *list);
-EntangleCameraList * entangle_camera_list_new           (void);
-gboolean            entangle_camera_list_refresh        (EntangleCameraList *list,
-                                                         GError **error);
 void                entangle_camera_list_remove         (EntangleCameraList *list,
                                                          EntangleCamera *cam);
+EntangleCamera *    entangle_camera_list_get            (EntangleCameraList *list,
+                                                         int entry);
+GList *             entangle_camera_list_get_cameras    (EntangleCameraList *list);
+EntangleCamera *    entangle_camera_list_find           (EntangleCameraList *list,
+                                                         const char *port);
+gchar **            entangle_camera_list_get_supported  (EntangleCameraList *list);

Object Hierarchy

-  GObject
+  GObject
    +----EntangleCameraList
@@ -77,8 +77,8 @@

Signals

-  "camera-added"                                   : Run First
-  "camera-removed"                                 : Run First
+  "camera-added"                                   : Run First
+  "camera-removed"                                 : Run First
@@ -103,9 +103,14 @@
-

entangle_camera_list_add ()

-
void                entangle_camera_list_add            (EntangleCameraList *list,
-                                                         EntangleCamera *cam);
+

entangle_camera_list_new ()

+
EntangleCameraList * entangle_camera_list_new           (void);
+
+
+
+

entangle_camera_list_refresh ()

+
gboolean            entangle_camera_list_refresh        (EntangleCameraList *list,
+                                                         GError **error);
@@ -114,9 +119,15 @@
-

entangle_camera_list_find ()

-
EntangleCamera *    entangle_camera_list_find           (EntangleCameraList *list,
-                                                         const char *port);
+

entangle_camera_list_add ()

+
void                entangle_camera_list_add            (EntangleCameraList *list,
+                                                         EntangleCamera *cam);
+
+
+
+

entangle_camera_list_remove ()

+
void                entangle_camera_list_remove         (EntangleCameraList *list,
+                                                         EntangleCamera *cam);
@@ -127,7 +138,7 @@

entangle_camera_list_get_cameras ()

-
GList *             entangle_camera_list_get_cameras    (EntangleCameraList *list);
+
GList *             entangle_camera_list_get_cameras    (EntangleCameraList *list);
@@ -148,25 +159,14 @@
-

entangle_camera_list_get_supported ()

-
gchar **            entangle_camera_list_get_supported  (EntangleCameraList *list);
-
-
-
-

entangle_camera_list_new ()

-
EntangleCameraList * entangle_camera_list_new           (void);
-
-
-
-

entangle_camera_list_refresh ()

-
gboolean            entangle_camera_list_refresh        (EntangleCameraList *list,
-                                                         GError **error);
+

entangle_camera_list_find ()

+
EntangleCamera *    entangle_camera_list_find           (EntangleCameraList *list,
+                                                         const char *port);
-

entangle_camera_list_remove ()

-
void                entangle_camera_list_remove         (EntangleCameraList *list,
-                                                         EntangleCamera *cam);
+

entangle_camera_list_get_supported ()

+
gchar **            entangle_camera_list_get_supported  (EntangleCameraList *list);
@@ -183,19 +183,19 @@

The "camera-added" signal

void                user_function                      (EntangleCameraList *entanglecameralist,
                                                         EntangleCamera     *arg1,
-                                                        gpointer            user_data)               : Run First
+ gpointer user_data) : Run First

The "camera-removed" signal

void                user_function                      (EntangleCameraList *entanglecameralist,
                                                         EntangleCamera     *arg1,
-                                                        gpointer            user_data)               : Run First
+ gpointer user_data) : Run First
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleCameraManager.html entangle-0.5.2/docs/reference/html/EntangleCameraManager.html --- entangle-0.5.1/docs/reference/html/EntangleCameraManager.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleCameraManager.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleCameraManager - + - + @@ -47,27 +47,27 @@

Synopsis

struct              EntangleCameraManager;
 struct              EntangleCameraManagerClass;
-void                entangle_camera_manager_capture     (EntangleCameraManager *manager);
-EntangleApplication * entangle_camera_manager_get_application
-                                                        (EntangleCameraManager *manager);
-EntangleCamera *    entangle_camera_manager_get_camera  (EntangleCameraManager *manager);
-GtkWindow *         entangle_camera_manager_get_window  (EntangleCameraManager *manager);
-void                entangle_camera_manager_hide        (EntangleCameraManager *manager);
 EntangleCameraManager * entangle_camera_manager_new     (EntangleApplication *app);
+GtkWindow *         entangle_camera_manager_get_window  (EntangleCameraManager *manager);
+void                entangle_camera_manager_show        (EntangleCameraManager *manager);
+void                entangle_camera_manager_hide        (EntangleCameraManager *manager);
+void                entangle_camera_manager_capture     (EntangleCameraManager *manager);
 void                entangle_camera_manager_preview_begin
                                                         (EntangleCameraManager *manager);
 void                entangle_camera_manager_preview_cancel
                                                         (EntangleCameraManager *manager);
+gboolean            entangle_camera_manager_visible     (EntangleCameraManager *manager);
 void                entangle_camera_manager_set_camera  (EntangleCameraManager *manager,
                                                          EntangleCamera *cam);
-void                entangle_camera_manager_show        (EntangleCameraManager *manager);
-gboolean            entangle_camera_manager_visible     (EntangleCameraManager *manager);
+EntangleCamera *    entangle_camera_manager_get_camera  (EntangleCameraManager *manager);
+EntangleApplication * entangle_camera_manager_get_application
+                                                        (EntangleCameraManager *manager);

Object Hierarchy

-  GObject
+  GObject
    +----EntangleCameraManager
@@ -87,7 +87,7 @@

Signals

-  "closed"                                         : Run First
+  "closed"                                         : Run First
@@ -112,24 +112,18 @@
-

entangle_camera_manager_capture ()

-
void                entangle_camera_manager_capture     (EntangleCameraManager *manager);
-
-
-
-

entangle_camera_manager_get_application ()

-
EntangleApplication * entangle_camera_manager_get_application
-                                                        (EntangleCameraManager *manager);
+

entangle_camera_manager_new ()

+
EntangleCameraManager * entangle_camera_manager_new     (EntangleApplication *app);
-

entangle_camera_manager_get_camera ()

-
EntangleCamera *    entangle_camera_manager_get_camera  (EntangleCameraManager *manager);
+

entangle_camera_manager_get_window ()

+
GtkWindow *         entangle_camera_manager_get_window  (EntangleCameraManager *manager);
-

entangle_camera_manager_get_window ()

-
GtkWindow *         entangle_camera_manager_get_window  (EntangleCameraManager *manager);
+

entangle_camera_manager_show ()

+
void                entangle_camera_manager_show        (EntangleCameraManager *manager);
@@ -138,8 +132,8 @@
-

entangle_camera_manager_new ()

-
EntangleCameraManager * entangle_camera_manager_new     (EntangleApplication *app);
+

entangle_camera_manager_capture ()

+
void                entangle_camera_manager_capture     (EntangleCameraManager *manager);
@@ -155,19 +149,25 @@
+

entangle_camera_manager_visible ()

+
gboolean            entangle_camera_manager_visible     (EntangleCameraManager *manager);
+
+
+

entangle_camera_manager_set_camera ()

void                entangle_camera_manager_set_camera  (EntangleCameraManager *manager,
                                                          EntangleCamera *cam);
-

entangle_camera_manager_show ()

-
void                entangle_camera_manager_show        (EntangleCameraManager *manager);
+

entangle_camera_manager_get_camera ()

+
EntangleCamera *    entangle_camera_manager_get_camera  (EntangleCameraManager *manager);
-

entangle_camera_manager_visible ()

-
gboolean            entangle_camera_manager_visible     (EntangleCameraManager *manager);
+

entangle_camera_manager_get_application ()

+
EntangleApplication * entangle_camera_manager_get_application
+                                                        (EntangleCameraManager *manager);
@@ -189,12 +189,12 @@

The "closed" signal

void                user_function                      (EntangleCameraManager *entanglecameramanager,
-                                                        gpointer               user_data)                  : Run First
+ gpointer user_data) : Run First
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleCameraPicker.html entangle-0.5.2/docs/reference/html/EntangleCameraPicker.html --- entangle-0.5.1/docs/reference/html/EntangleCameraPicker.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleCameraPicker.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleCameraPicker - + - + @@ -45,17 +45,17 @@

Synopsis

struct              EntangleCameraPicker;
 struct              EntangleCameraPickerClass;
-GtkWindow *         entangle_camera_picker_get_window   (EntangleCameraPicker *picker);
-void                entangle_camera_picker_hide         (EntangleCameraPicker *picker);
 EntangleCameraPicker * entangle_camera_picker_new       (EntangleCameraList *cameras);
+GtkWindow *         entangle_camera_picker_get_window   (EntangleCameraPicker *picker);
 void                entangle_camera_picker_show         (EntangleCameraPicker *picker);
-gboolean            entangle_camera_picker_visible      (EntangleCameraPicker *picker);
+void                entangle_camera_picker_hide         (EntangleCameraPicker *picker);
+gboolean            entangle_camera_picker_visible      (EntangleCameraPicker *picker);

Object Hierarchy

-  GObject
+  GObject
    +----EntangleCameraPicker
@@ -68,9 +68,9 @@

Signals

-  "picker-close"                                   : Run First
-  "picker-connect"                                 : Run First
-  "picker-refresh"                                 : Run First
+  "picker-close"                                   : Run First
+  "picker-connect"                                 : Run First
+  "picker-refresh"                                 : Run First
@@ -96,28 +96,28 @@
-

entangle_camera_picker_get_window ()

-
GtkWindow *         entangle_camera_picker_get_window   (EntangleCameraPicker *picker);
+

entangle_camera_picker_new ()

+
EntangleCameraPicker * entangle_camera_picker_new       (EntangleCameraList *cameras);
-

entangle_camera_picker_hide ()

-
void                entangle_camera_picker_hide         (EntangleCameraPicker *picker);
+

entangle_camera_picker_get_window ()

+
GtkWindow *         entangle_camera_picker_get_window   (EntangleCameraPicker *picker);
-

entangle_camera_picker_new ()

-
EntangleCameraPicker * entangle_camera_picker_new       (EntangleCameraList *cameras);
+

entangle_camera_picker_show ()

+
void                entangle_camera_picker_show         (EntangleCameraPicker *picker);
-

entangle_camera_picker_show ()

-
void                entangle_camera_picker_show         (EntangleCameraPicker *picker);
+

entangle_camera_picker_hide ()

+
void                entangle_camera_picker_hide         (EntangleCameraPicker *picker);

entangle_camera_picker_visible ()

-
gboolean            entangle_camera_picker_visible      (EntangleCameraPicker *picker);
+
gboolean            entangle_camera_picker_visible      (EntangleCameraPicker *picker);
@@ -133,25 +133,25 @@

The "picker-close" signal

void                user_function                      (EntangleCameraPicker *entanglecamerapicker,
-                                                        gpointer              user_data)                 : Run First
+ gpointer user_data) : Run First

The "picker-connect" signal

void                user_function                      (EntangleCameraPicker *entanglecamerapicker,
-                                                        GObject              *arg1,
-                                                        gpointer              user_data)                 : Run First
+ GObject *arg1, + gpointer user_data) : Run First

The "picker-refresh" signal

void                user_function                      (EntangleCameraPicker *entanglecamerapicker,
-                                                        gpointer              user_data)                 : Run First
+ gpointer user_data) : Run First
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleCameraSupport.html entangle-0.5.2/docs/reference/html/EntangleCameraSupport.html --- entangle-0.5.1/docs/reference/html/EntangleCameraSupport.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleCameraSupport.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleCameraSupport - + - + @@ -46,21 +46,21 @@ 
#define             ENTANGLE_TYPE_CAMERA_SUPPORT_DATA
 struct              EntangleCameraSupport;
 struct              EntangleCameraSupportClass;
-EntangleCameraList * entangle_camera_support_get_camera_list
-                                                        (EntangleCameraSupport *support);
-GtkWindow *         entangle_camera_support_get_window  (EntangleCameraSupport *support);
-void                entangle_camera_support_hide        (EntangleCameraSupport *support);
 EntangleCameraSupport * entangle_camera_support_new     (EntangleCameraList *list);
+GtkWindow *         entangle_camera_support_get_window  (EntangleCameraSupport *support);
+void                entangle_camera_support_show        (EntangleCameraSupport *support);
+void                entangle_camera_support_hide        (EntangleCameraSupport *support);
 void                entangle_camera_support_set_camera_list
                                                         (EntangleCameraSupport *support,
                                                          EntangleCameraList *list);
-void                entangle_camera_support_show        (EntangleCameraSupport *support);
+EntangleCameraList * entangle_camera_support_get_camera_list
+                                                        (EntangleCameraSupport *support);

Object Hierarchy

-  GObject
+  GObject
    +----EntangleCameraSupport
@@ -73,7 +73,7 @@

Signals

-  "support-close"                                  : Run First
+  "support-close"                                  : Run First
@@ -103,24 +103,23 @@
-

entangle_camera_support_get_camera_list ()

-
EntangleCameraList * entangle_camera_support_get_camera_list
-                                                        (EntangleCameraSupport *support);
+

entangle_camera_support_new ()

+
EntangleCameraSupport * entangle_camera_support_new     (EntangleCameraList *list);

entangle_camera_support_get_window ()

-
GtkWindow *         entangle_camera_support_get_window  (EntangleCameraSupport *support);
+
GtkWindow *         entangle_camera_support_get_window  (EntangleCameraSupport *support);
-

entangle_camera_support_hide ()

-
void                entangle_camera_support_hide        (EntangleCameraSupport *support);
+

entangle_camera_support_show ()

+
void                entangle_camera_support_show        (EntangleCameraSupport *support);
-

entangle_camera_support_new ()

-
EntangleCameraSupport * entangle_camera_support_new     (EntangleCameraList *list);
+

entangle_camera_support_hide ()

+
void                entangle_camera_support_hide        (EntangleCameraSupport *support);
@@ -131,8 +130,9 @@
-

entangle_camera_support_show ()

-
void                entangle_camera_support_show        (EntangleCameraSupport *support);
+

entangle_camera_support_get_camera_list ()

+
EntangleCameraList * entangle_camera_support_get_camera_list
+                                                        (EntangleCameraSupport *support);
@@ -148,12 +148,12 @@

The "support-close" signal

void                user_function                      (EntangleCameraSupport *entanglecamerasupport,
-                                                        gpointer               user_data)                  : Run First
+ gpointer user_data) : Run First
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleColourProfile.html entangle-0.5.2/docs/reference/html/EntangleColourProfile.html --- entangle-0.5.1/docs/reference/html/EntangleColourProfile.html 1970-01-01 00:00:00.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleColourProfile.html 2013-08-17 18:28:18.000000000 +0000 @@ -0,0 +1,269 @@ + + + + +EntangleColourProfile + + + + + + + + + +
+ + + + + + + + + +
+
+
+ + +
+

EntangleColourProfile

+

EntangleColourProfile

+
+
+

Synopsis

+
struct              EntangleColourProfile;
+struct              EntangleColourProfileClass;
+struct              EntangleColourProfileTransform;
+struct              EntangleColourProfileTransformClass;
+enum                EntangleColourProfileIntent;
+EntangleColourProfile * entangle_colour_profile_new_file
+                                                        (const char *filename);
+EntangleColourProfile * entangle_colour_profile_new_data
+                                                        (GByteArray *data);
+const char *        entangle_colour_profile_filename    (EntangleColourProfile *profile);
+char *              entangle_colour_profile_product_name
+                                                        (EntangleColourProfile *profile);
+char *              entangle_colour_profile_product_desc
+                                                        (EntangleColourProfile *profile);
+char *              entangle_colour_profile_product_info
+                                                        (EntangleColourProfile *profile);
+char *              entangle_colour_profile_manufacturer
+                                                        (EntangleColourProfile *profile);
+char *              entangle_colour_profile_model       (EntangleColourProfile *profile);
+char *              entangle_colour_profile_copyright   (EntangleColourProfile *profile);
+EntangleColourProfileTransform * entangle_colour_profile_transform_new
+                                                        (EntangleColourProfile *src,
+                                                         EntangleColourProfile *dst,
+                                                         EntangleColourProfileIntent intent);
+GdkPixbuf *         entangle_colour_profile_transform_apply
+                                                        (EntangleColourProfileTransform *trans,
+                                                         GdkPixbuf *pixbuf);
+
+
+
+

Object Hierarchy

+
+  GObject
+   +----EntangleColourProfile
+
+
+  GObject
+   +----EntangleColourProfileTransform
+
+
+  GEnum
+   +----EntangleColourProfileIntent
+
+
+
+

Properties

+
+  "data"                     GByteArray*           : Read / Write / Construct Only
+  "filename"                 gchar*                : Read / Write / Construct Only
+  "dst-profile"              EntangleColourProfile*  : Read / Write / Construct Only
+  "rendering-intent"         EntangleColourProfileIntent  : Read / Write / Construct Only
+  "src-profile"              EntangleColourProfile*  : Read / Write / Construct Only
+
+
+
+

Description

+
+
+

Details

+
+

struct EntangleColourProfile

+
struct EntangleColourProfile;
+
+
+
+

struct EntangleColourProfileClass

+
struct EntangleColourProfileClass {
+    GObjectClass parent_class;
+};
+
+
+
+
+

struct EntangleColourProfileTransform

+
struct EntangleColourProfileTransform;
+
+
+
+

struct EntangleColourProfileTransformClass

+
struct EntangleColourProfileTransformClass {
+    GObjectClass parent_class;
+};
+
+
+
+
+

enum EntangleColourProfileIntent

+
typedef enum {
+    ENTANGLE_COLOUR_PROFILE_INTENT_PERCEPTUAL,
+    ENTANGLE_COLOUR_PROFILE_INTENT_REL_COLOURIMETRIC,
+    ENTANGLE_COLOUR_PROFILE_INTENT_SATURATION,
+    ENTANGLE_COLOUR_PROFILE_INTENT_ABS_COLOURIMETRIC,
+} EntangleColourProfileIntent;
+
+
++++ + + + + + + + + + + + + + + + + + + +

ENTANGLE_COLOUR_PROFILE_INTENT_PERCEPTUAL

ENTANGLE_COLOUR_PROFILE_INTENT_REL_COLOURIMETRIC

ENTANGLE_COLOUR_PROFILE_INTENT_SATURATION

ENTANGLE_COLOUR_PROFILE_INTENT_ABS_COLOURIMETRIC

+
+
+
+

entangle_colour_profile_new_file ()

+
EntangleColourProfile * entangle_colour_profile_new_file
+                                                        (const char *filename);
+
+
+
+

entangle_colour_profile_new_data ()

+
EntangleColourProfile * entangle_colour_profile_new_data
+                                                        (GByteArray *data);
+
+
+
+

entangle_colour_profile_filename ()

+
const char *        entangle_colour_profile_filename    (EntangleColourProfile *profile);
+
+
+
+

entangle_colour_profile_product_name ()

+
char *              entangle_colour_profile_product_name
+                                                        (EntangleColourProfile *profile);
+
+
+
+

entangle_colour_profile_product_desc ()

+
char *              entangle_colour_profile_product_desc
+                                                        (EntangleColourProfile *profile);
+
+
+
+

entangle_colour_profile_product_info ()

+
char *              entangle_colour_profile_product_info
+                                                        (EntangleColourProfile *profile);
+
+
+
+

entangle_colour_profile_manufacturer ()

+
char *              entangle_colour_profile_manufacturer
+                                                        (EntangleColourProfile *profile);
+
+
+
+

entangle_colour_profile_model ()

+
char *              entangle_colour_profile_model       (EntangleColourProfile *profile);
+
+
+
+

entangle_colour_profile_copyright ()

+
char *              entangle_colour_profile_copyright   (EntangleColourProfile *profile);
+
+
+
+

entangle_colour_profile_transform_new ()

+
EntangleColourProfileTransform * entangle_colour_profile_transform_new
+                                                        (EntangleColourProfile *src,
+                                                         EntangleColourProfile *dst,
+                                                         EntangleColourProfileIntent intent);
+
+
+
+

entangle_colour_profile_transform_apply ()

+
GdkPixbuf *         entangle_colour_profile_transform_apply
+                                                        (EntangleColourProfileTransform *trans,
+                                                         GdkPixbuf *pixbuf);
+
+
+
+

Property Details

+
+

The "data" property

+
  "data"                     GByteArray*           : Read / Write / Construct Only
+

Raw data for the profile.

+
+
+
+

The "filename" property

+
  "filename"                 gchar*                : Read / Write / Construct Only
+

Filename of the profile.

+

Default value: NULL

+
+
+
+

The "dst-profile" property

+
  "dst-profile"              EntangleColourProfile*  : Read / Write / Construct Only
+

Destination Profile.

+
+
+
+

The "rendering-intent" property

+
  "rendering-intent"         EntangleColourProfileIntent  : Read / Write / Construct Only
+

Profile rendering intent.

+

Default value: ENTANGLE_COLOUR_PROFILE_INTENT_PERCEPTUAL

+
+
+
+

The "src-profile" property

+
  "src-profile"              EntangleColourProfile*  : Read / Write / Construct Only
+

Source profile.

+
+
+
+
+
+ Generated by GTK-Doc V1.19
+ + \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleColourProfileTransform.html entangle-0.5.2/docs/reference/html/EntangleColourProfileTransform.html --- entangle-0.5.1/docs/reference/html/EntangleColourProfileTransform.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleColourProfileTransform.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,245 +0,0 @@ - - - - -EntangleColourProfileTransform - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

EntangleColourProfileTransform

-

EntangleColourProfileTransform

-
-
-

Synopsis

-
struct              EntangleColourProfile;
-struct              EntangleColourProfileClass;
-enum                EntangleColourProfileIntent;
-struct              EntangleColourProfileTransform;
-struct              EntangleColourProfileTransformClass;
-char *              entangle_colour_profile_copyright   (EntangleColourProfile *profile);
-const char *        entangle_colour_profile_filename    (EntangleColourProfile *profile);
-char *              entangle_colour_profile_manufacturer
-                                                        (EntangleColourProfile *profile);
-char *              entangle_colour_profile_model       (EntangleColourProfile *profile);
-EntangleColourProfile * entangle_colour_profile_new_data
-                                                        (GByteArray *data);
-EntangleColourProfile * entangle_colour_profile_new_file
-                                                        (const char *filename);
-char *              entangle_colour_profile_product_desc
-                                                        (EntangleColourProfile *profile);
-char *              entangle_colour_profile_product_info
-                                                        (EntangleColourProfile *profile);
-char *              entangle_colour_profile_product_name
-                                                        (EntangleColourProfile *profile);
-GdkPixbuf *         entangle_colour_profile_transform_apply
-                                                        (EntangleColourProfileTransform *trans,
-                                                         GdkPixbuf *pixbuf);
-EntangleColourProfileTransform * entangle_colour_profile_transform_new
-                                                        (EntangleColourProfile *src,
-                                                         EntangleColourProfile *dst,
-                                                         EntangleColourProfileIntent intent);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----EntangleColourProfile
-
-
-  GEnum
-   +----EntangleColourProfileIntent
-
-
-  GObject
-   +----EntangleColourProfileTransform
-
-
-
-

Properties

-
-  "data"                     GByteArray*           : Read / Write / Construct Only
-  "filename"                 gchar*                : Read / Write / Construct Only
-  "dst-profile"              EntangleColourProfile*  : Read / Write / Construct Only
-  "rendering-intent"         EntangleColourProfileIntent  : Read / Write / Construct Only
-  "src-profile"              EntangleColourProfile*  : Read / Write / Construct Only
-
-
-
-

Description

-
-
-

Details

-
-

struct EntangleColourProfile

-
struct EntangleColourProfile;
-
-
-
-

struct EntangleColourProfileClass

-
struct EntangleColourProfileClass {
-    GObjectClass parent_class;
-};
-
-
-
-
-

enum EntangleColourProfileIntent

-
typedef enum {
-    ENTANGLE_COLOUR_PROFILE_INTENT_PERCEPTUAL,
-    ENTANGLE_COLOUR_PROFILE_INTENT_REL_COLOURIMETRIC,
-    ENTANGLE_COLOUR_PROFILE_INTENT_SATURATION,
-    ENTANGLE_COLOUR_PROFILE_INTENT_ABS_COLOURIMETRIC,
-} EntangleColourProfileIntent;
-
-
-
-
-

struct EntangleColourProfileTransform

-
struct EntangleColourProfileTransform;
-
-
-
-

struct EntangleColourProfileTransformClass

-
struct EntangleColourProfileTransformClass {
-    GObjectClass parent_class;
-};
-
-
-
-
-

entangle_colour_profile_copyright ()

-
char *              entangle_colour_profile_copyright   (EntangleColourProfile *profile);
-
-
-
-

entangle_colour_profile_filename ()

-
const char *        entangle_colour_profile_filename    (EntangleColourProfile *profile);
-
-
-
-

entangle_colour_profile_manufacturer ()

-
char *              entangle_colour_profile_manufacturer
-                                                        (EntangleColourProfile *profile);
-
-
-
-

entangle_colour_profile_model ()

-
char *              entangle_colour_profile_model       (EntangleColourProfile *profile);
-
-
-
-

entangle_colour_profile_new_data ()

-
EntangleColourProfile * entangle_colour_profile_new_data
-                                                        (GByteArray *data);
-
-
-
-

entangle_colour_profile_new_file ()

-
EntangleColourProfile * entangle_colour_profile_new_file
-                                                        (const char *filename);
-
-
-
-

entangle_colour_profile_product_desc ()

-
char *              entangle_colour_profile_product_desc
-                                                        (EntangleColourProfile *profile);
-
-
-
-

entangle_colour_profile_product_info ()

-
char *              entangle_colour_profile_product_info
-                                                        (EntangleColourProfile *profile);
-
-
-
-

entangle_colour_profile_product_name ()

-
char *              entangle_colour_profile_product_name
-                                                        (EntangleColourProfile *profile);
-
-
-
-

entangle_colour_profile_transform_apply ()

-
GdkPixbuf *         entangle_colour_profile_transform_apply
-                                                        (EntangleColourProfileTransform *trans,
-                                                         GdkPixbuf *pixbuf);
-
-
-
-

entangle_colour_profile_transform_new ()

-
EntangleColourProfileTransform * entangle_colour_profile_transform_new
-                                                        (EntangleColourProfile *src,
-                                                         EntangleColourProfile *dst,
-                                                         EntangleColourProfileIntent intent);
-
-
-
-

Property Details

-
-

The "data" property

-
  "data"                     GByteArray*           : Read / Write / Construct Only
-

Raw data for the profile.

-
-
-
-

The "filename" property

-
  "filename"                 gchar*                : Read / Write / Construct Only
-

Filename of the profile.

-

Default value: NULL

-
-
-
-

The "dst-profile" property

-
  "dst-profile"              EntangleColourProfile*  : Read / Write / Construct Only
-

Destination Profile.

-
-
-
-

The "rendering-intent" property

-
  "rendering-intent"         EntangleColourProfileIntent  : Read / Write / Construct Only
-

Profile rendering intent.

-

Default value: ENTANGLE_COLOUR_PROFILE_INTENT_PERCEPTUAL

-
-
-
-

The "src-profile" property

-
  "src-profile"              EntangleColourProfile*  : Read / Write / Construct Only
-

Source profile.

-
-
-
-
-
- Generated by GTK-Doc V1.18
- - \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleControl.html entangle-0.5.2/docs/reference/html/EntangleControl.html --- entangle-0.5.1/docs/reference/html/EntangleControl.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleControl.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,18 +3,18 @@ EntangleControl - + - + - + - + @@ -43,27 +43,27 @@

Synopsis

struct              EntangleControl;
 struct              EntangleControlClass;
-gboolean            entangle_control_get_dirty          (EntangleControl *control);
-gint                entangle_control_get_id             (EntangleControl *control);
-const gchar *       entangle_control_get_info           (EntangleControl *control);
-const gchar *       entangle_control_get_label          (EntangleControl *control);
-const gchar *       entangle_control_get_path           (EntangleControl *control);
-gboolean            entangle_control_get_readonly       (EntangleControl *control);
-EntangleControl *   entangle_control_new                (const gchar *path,
-                                                         gint id,
-                                                         const gchar *label,
-                                                         const gchar *info,
-                                                         gboolean readonly);
+EntangleControl *   entangle_control_new                (const gchar *path,
+                                                         gint id,
+                                                         const gchar *label,
+                                                         const gchar *info,
+                                                         gboolean readonly);
+gint                entangle_control_get_id             (EntangleControl *control);
+const gchar *       entangle_control_get_path           (EntangleControl *control);
+const gchar *       entangle_control_get_label          (EntangleControl *control);
+const gchar *       entangle_control_get_info           (EntangleControl *control);
+gboolean            entangle_control_get_dirty          (EntangleControl *control);
 void                entangle_control_set_dirty          (EntangleControl *control,
-                                                         gboolean dirty);
+                                                         gboolean dirty);
+gboolean            entangle_control_get_readonly       (EntangleControl *control);
 void                entangle_control_set_readonly       (EntangleControl *control,
-                                                         gboolean ro);
+                                                         gboolean ro);

Object Hierarchy

-  GObject
+  GObject
    +----EntangleControl
          +----EntangleControlButton
          +----EntangleControlChoice
@@ -77,12 +77,12 @@
 

 
Properties

 
-  "dirty"                    gboolean              : Read / Write / Construct Only
-  "id"                       gint                  : Read / Write / Construct Only
-  "info"                     gchar*                : Read / Write / Construct Only
-  "label"                    gchar*                : Read / Write / Construct Only
-  "path"                     gchar*                : Read / Write / Construct Only
-  "readonly"                 gboolean              : Read / Write / Construct Only
+  "dirty"                    gboolean              : Read / Write / Construct Only
+  "id"                       gint                  : Read / Write / Construct Only
+  "info"                     gchar*                : Read / Write / Construct Only
+  "label"                    gchar*                : Read / Write / Construct Only
+  "path"                     gchar*                : Read / Write / Construct Only
+  "readonly"                 gboolean              : Read / Write / Construct Only
 

 

 

@@ -104,68 +104,68 @@
 

 

 

-
entangle_control_get_dirty ()

-
gboolean            entangle_control_get_dirty          (EntangleControl *control);

+
entangle_control_new ()

+
EntangleControl *   entangle_control_new                (const gchar *path,
+                                                         gint id,
+                                                         const gchar *label,
+                                                         const gchar *info,
+                                                         gboolean readonly);

 

 

 

 
entangle_control_get_id ()

-
gint                entangle_control_get_id             (EntangleControl *control);

+
gint                entangle_control_get_id             (EntangleControl *control);

 

 

 

-
entangle_control_get_info ()

-
const gchar *       entangle_control_get_info           (EntangleControl *control);

+
entangle_control_get_path ()

+
const gchar *       entangle_control_get_path           (EntangleControl *control);

 

 

 

 
entangle_control_get_label ()

-
const gchar *       entangle_control_get_label          (EntangleControl *control);

+
const gchar *       entangle_control_get_label          (EntangleControl *control);

 

 

 

-
entangle_control_get_path ()

-
const gchar *       entangle_control_get_path           (EntangleControl *control);

+
entangle_control_get_info ()

+
const gchar *       entangle_control_get_info           (EntangleControl *control);

 

 

 

-
entangle_control_get_readonly ()

-
gboolean            entangle_control_get_readonly       (EntangleControl *control);

+
entangle_control_get_dirty ()

+
gboolean            entangle_control_get_dirty          (EntangleControl *control);

 

 

 

-
entangle_control_new ()

-
EntangleControl *   entangle_control_new                (const gchar *path,
-                                                         gint id,
-                                                         const gchar *label,
-                                                         const gchar *info,
-                                                         gboolean readonly);

+
entangle_control_set_dirty ()

+
void                entangle_control_set_dirty          (EntangleControl *control,
+                                                         gboolean dirty);

 

 

 

-
entangle_control_set_dirty ()

-
void                entangle_control_set_dirty          (EntangleControl *control,
-                                                         gboolean dirty);

+
entangle_control_get_readonly ()

+
gboolean            entangle_control_get_readonly       (EntangleControl *control);

 

 

 

 
entangle_control_set_readonly ()

 
void                entangle_control_set_readonly       (EntangleControl *control,
-                                                         gboolean ro);

+                                                         gboolean ro);

Property Details

The "dirty" property

-
  "dirty"                    gboolean              : Read / Write / Construct Only
+
  "dirty"                    gboolean              : Read / Write / Construct Only

Dirty if value has been changed.

Default value: FALSE

The "id" property

-
  "id"                       gint                  : Read / Write / Construct Only
+
  "id"                       gint                  : Read / Write / Construct Only

Id of the control.

Allowed values: >= 0

Default value: 0

@@ -173,28 +173,28 @@

The "info" property

-
  "info"                     gchar*                : Read / Write / Construct Only
+
  "info"                     gchar*                : Read / Write / Construct Only

Info of the control.

Default value: NULL

The "label" property

-
  "label"                    gchar*                : Read / Write / Construct Only
+
  "label"                    gchar*                : Read / Write / Construct Only

Label of the control.

Default value: NULL

The "path" property

-
  "path"                     gchar*                : Read / Write / Construct Only
+
  "path"                     gchar*                : Read / Write / Construct Only

Path of the control.

Default value: NULL

The "readonly" property

-
  "readonly"                 gboolean              : Read / Write / Construct Only
+
  "readonly"                 gboolean              : Read / Write / Construct Only

State of the control.

Default value: FALSE

@@ -202,6 +202,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19
\ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleControlButton.html entangle-0.5.2/docs/reference/html/EntangleControlButton.html --- entangle-0.5.1/docs/reference/html/EntangleControlButton.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleControlButton.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleControlButton - + - + @@ -45,13 +45,13 @@ int id, const char *label, const char *info, - gboolean readonly); + gboolean readonly);

Object Hierarchy

-  GObject
+  GObject
    +----EntangleControl
          +----EntangleControlButton
@@ -80,12 +80,12 @@ int id, const char *label, const char *info, - gboolean readonly); + gboolean readonly);
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleControlChoice.html entangle-0.5.2/docs/reference/html/EntangleControlChoice.html --- entangle-0.5.1/docs/reference/html/EntangleControlChoice.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleControlChoice.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleControlChoice - + - + @@ -43,22 +43,22 @@

Synopsis

struct              EntangleControlChoice;
 struct              EntangleControlChoiceClass;
+EntangleControlChoice * entangle_control_choice_new     (const char *path,
+                                                         int id,
+                                                         const char *label,
+                                                         const char *info,
+                                                         gboolean readonly);
 void                entangle_control_choice_add_entry   (EntangleControlChoice *choice,
                                                          const char *entry);
 int                 entangle_control_choice_entry_count (EntangleControlChoice *choice);
 const char *        entangle_control_choice_entry_get   (EntangleControlChoice *choice,
                                                          int idx);
-EntangleControlChoice * entangle_control_choice_new     (const char *path,
-                                                         int id,
-                                                         const char *label,
-                                                         const char *info,
-                                                         gboolean readonly);

Object Hierarchy

-  GObject
+  GObject
    +----EntangleControl
          +----EntangleControlChoice
@@ -66,7 +66,7 @@

Properties

-  "value"                    gchar*                : Read / Write
+  "value"                    gchar*                : Read / Write
@@ -88,6 +88,15 @@
+

entangle_control_choice_new ()

+
EntangleControlChoice * entangle_control_choice_new     (const char *path,
+                                                         int id,
+                                                         const char *label,
+                                                         const char *info,
+                                                         gboolean readonly);
+
+
+

entangle_control_choice_add_entry ()

void                entangle_control_choice_add_entry   (EntangleControlChoice *choice,
                                                          const char *entry);
@@ -103,21 +112,12 @@ 
const char *        entangle_control_choice_entry_get   (EntangleControlChoice *choice,
                                                          int idx);
-
-
-

entangle_control_choice_new ()

-
EntangleControlChoice * entangle_control_choice_new     (const char *path,
-                                                         int id,
-                                                         const char *label,
-                                                         const char *info,
-                                                         gboolean readonly);
-

Property Details

The "value" property

-
  "value"                    gchar*                : Read / Write
+
  "value"                    gchar*                : Read / Write

Current value of the control.

Default value: NULL

@@ -125,6 +125,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleControlDate.html entangle-0.5.2/docs/reference/html/EntangleControlDate.html --- entangle-0.5.1/docs/reference/html/EntangleControlDate.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleControlDate.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleControlDate - + - + @@ -47,13 +47,13 @@ int id, const char *label, const char *info, - gboolean readonly); + gboolean readonly);

Object Hierarchy

-  GObject
+  GObject
    +----EntangleControl
          +----EntangleControlDate
@@ -61,7 +61,7 @@

Properties

-  "value"                    gint                  : Read / Write
+  "value"                    gint                  : Read / Write
@@ -88,14 +88,14 @@ int id, const char *label, const char *info, - gboolean readonly); + gboolean readonly);

Property Details

The "value" property

-
  "value"                    gint                  : Read / Write
+
  "value"                    gint                  : Read / Write

Current value of the control.

Default value: 0

@@ -103,6 +103,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleControlGroup.html entangle-0.5.2/docs/reference/html/EntangleControlGroup.html --- entangle-0.5.1/docs/reference/html/EntangleControlGroup.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleControlGroup.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleControlGroup - + - + @@ -41,24 +41,24 @@

Synopsis

struct              EntangleControlGroup;
 struct              EntangleControlGroupClass;
+EntangleControlGroup * entangle_control_group_new       (const gchar *path,
+                                                         gint id,
+                                                         const gchar *label,
+                                                         const gchar *info,
+                                                         gboolean readonly);
 void                entangle_control_group_add          (EntangleControlGroup *group,
                                                          EntangleControl *control);
-guint               entangle_control_group_count        (EntangleControlGroup *group);
+guint               entangle_control_group_count        (EntangleControlGroup *group);
 EntangleControl *   entangle_control_group_get          (EntangleControlGroup *group,
                                                          int idx);
 EntangleControl *   entangle_control_group_get_by_path  (EntangleControlGroup *group,
-                                                         const gchar *path);
-EntangleControlGroup * entangle_control_group_new       (const gchar *path,
-                                                         gint id,
-                                                         const gchar *label,
-                                                         const gchar *info,
-                                                         gboolean readonly);
+                                                         const gchar *path);

Object Hierarchy

-  GObject
+  GObject
    +----EntangleControl
          +----EntangleControlGroup
@@ -82,6 +82,15 @@
+

entangle_control_group_new ()

+
EntangleControlGroup * entangle_control_group_new       (const gchar *path,
+                                                         gint id,
+                                                         const gchar *label,
+                                                         const gchar *info,
+                                                         gboolean readonly);
+
+
+

entangle_control_group_add ()

void                entangle_control_group_add          (EntangleControlGroup *group,
                                                          EntangleControl *control);
@@ -89,7 +98,7 @@

entangle_control_group_count ()

-
guint               entangle_control_group_count        (EntangleControlGroup *group);
+
guint               entangle_control_group_count        (EntangleControlGroup *group);
@@ -101,21 +110,12 @@

entangle_control_group_get_by_path ()

EntangleControl *   entangle_control_group_get_by_path  (EntangleControlGroup *group,
-                                                         const gchar *path);
-
-
-
-

entangle_control_group_new ()

-
EntangleControlGroup * entangle_control_group_new       (const gchar *path,
-                                                         gint id,
-                                                         const gchar *label,
-                                                         const gchar *info,
-                                                         gboolean readonly);
+ const gchar *path);
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleControlPanel.html entangle-0.5.2/docs/reference/html/EntangleControlPanel.html --- entangle-0.5.1/docs/reference/html/EntangleControlPanel.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleControlPanel.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleControlPanel - + - + @@ -45,23 +45,23 @@

Synopsis

struct              EntangleControlPanel;
 struct              EntangleControlPanelClass;
-EntangleCamera *    entangle_control_panel_get_camera   (EntangleControlPanel *panel);
-gboolean            entangle_control_panel_get_has_controls
-                                                        (EntangleControlPanel *panel);
 EntangleControlPanel * entangle_control_panel_new       (void);
 void                entangle_control_panel_set_camera   (EntangleControlPanel *panel,
                                                          EntangleCamera *cam);
+EntangleCamera *    entangle_control_panel_get_camera   (EntangleControlPanel *panel);
+gboolean            entangle_control_panel_get_has_controls
+                                                        (EntangleControlPanel *panel);

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBox
-                           +----GtkVBox
+  GObject
+   +----GInitiallyUnowned
+         +----GtkWidget
+               +----GtkContainer
+                     +----GtkBox
+                           +----GtkVBox
                                  +----EntangleControlPanel
@@ -69,13 +69,13 @@

Implemented Interfaces

EntangleControlPanel implements - AtkImplementorIface, GtkBuildable and GtkOrientable.

+ AtkImplementorIface, GtkBuildable and GtkOrientable.

Properties

   "camera"                   EntangleCamera*       : Read / Write
-  "has-controls"             gboolean              : Read
+  "has-controls"             gboolean              : Read
@@ -97,25 +97,25 @@
-

entangle_control_panel_get_camera ()

-
EntangleCamera *    entangle_control_panel_get_camera   (EntangleControlPanel *panel);
+

entangle_control_panel_new ()

+
EntangleControlPanel * entangle_control_panel_new       (void);
-

entangle_control_panel_get_has_controls ()

-
gboolean            entangle_control_panel_get_has_controls
-                                                        (EntangleControlPanel *panel);
+

entangle_control_panel_set_camera ()

+
void                entangle_control_panel_set_camera   (EntangleControlPanel *panel,
+                                                         EntangleCamera *cam);
-

entangle_control_panel_new ()

-
EntangleControlPanel * entangle_control_panel_new       (void);
+

entangle_control_panel_get_camera ()

+
EntangleCamera *    entangle_control_panel_get_camera   (EntangleControlPanel *panel);
-

entangle_control_panel_set_camera ()

-
void                entangle_control_panel_set_camera   (EntangleControlPanel *panel,
-                                                         EntangleCamera *cam);
+

entangle_control_panel_get_has_controls ()

+
gboolean            entangle_control_panel_get_has_controls
+                                                        (EntangleControlPanel *panel);
@@ -128,7 +128,7 @@

The "has-controls" property

-
  "has-controls"             gboolean              : Read
+
  "has-controls"             gboolean              : Read

Has Controls.

Default value: FALSE

@@ -136,6 +136,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleControlRange.html entangle-0.5.2/docs/reference/html/EntangleControlRange.html --- entangle-0.5.1/docs/reference/html/EntangleControlRange.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleControlRange.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleControlRange - + - + @@ -43,23 +43,23 @@

Synopsis

struct              EntangleControlRange;
 struct              EntangleControlRangeClass;
-float               entangle_control_range_get_max      (EntangleControlRange *range);
-float               entangle_control_range_get_min      (EntangleControlRange *range);
-float               entangle_control_range_get_step     (EntangleControlRange *range);
 EntangleControlRange * entangle_control_range_new       (const char *path,
                                                          int id,
                                                          const char *label,
                                                          const char *info,
-                                                         gboolean readonly,
+                                                         gboolean readonly,
                                                          float min,
                                                          float max,
                                                          float step);
+float               entangle_control_range_get_min      (EntangleControlRange *range);
+float               entangle_control_range_get_max      (EntangleControlRange *range);
+float               entangle_control_range_get_step     (EntangleControlRange *range);

Object Hierarchy

-  GObject
+  GObject
    +----EntangleControl
          +----EntangleControlRange
@@ -67,10 +67,10 @@

Properties

-  "range-max"                gfloat                : Read / Write / Construct Only
-  "range-min"                gfloat                : Read / Write / Construct Only
-  "range-step"               gfloat                : Read / Write / Construct Only
-  "value"                    gfloat                : Read / Write
+  "range-max"                gfloat                : Read / Write / Construct Only
+  "range-min"                gfloat                : Read / Write / Construct Only
+  "range-step"               gfloat                : Read / Write / Construct Only
+  "value"                    gfloat                : Read / Write
@@ -92,8 +92,15 @@
-

entangle_control_range_get_max ()

-
float               entangle_control_range_get_max      (EntangleControlRange *range);
+

entangle_control_range_new ()

+
EntangleControlRange * entangle_control_range_new       (const char *path,
+                                                         int id,
+                                                         const char *label,
+                                                         const char *info,
+                                                         gboolean readonly,
+                                                         float min,
+                                                         float max,
+                                                         float step);
@@ -102,27 +109,20 @@
-

entangle_control_range_get_step ()

-
float               entangle_control_range_get_step     (EntangleControlRange *range);
+

entangle_control_range_get_max ()

+
float               entangle_control_range_get_max      (EntangleControlRange *range);
-

entangle_control_range_new ()

-
EntangleControlRange * entangle_control_range_new       (const char *path,
-                                                         int id,
-                                                         const char *label,
-                                                         const char *info,
-                                                         gboolean readonly,
-                                                         float min,
-                                                         float max,
-                                                         float step);
+

entangle_control_range_get_step ()

+
float               entangle_control_range_get_step     (EntangleControlRange *range);

Property Details

The "range-max" property

-
  "range-max"                gfloat                : Read / Write / Construct Only
+
  "range-max"                gfloat                : Read / Write / Construct Only

Maximum range value.

Allowed values: [-1e+07,1e+07]

Default value: 0

@@ -130,7 +130,7 @@

The "range-min" property

-
  "range-min"                gfloat                : Read / Write / Construct Only
+
  "range-min"                gfloat                : Read / Write / Construct Only

Minimum range value.

Allowed values: [-1e+07,1e+07]

Default value: 0

@@ -138,7 +138,7 @@

The "range-step" property

-
  "range-step"               gfloat                : Read / Write / Construct Only
+
  "range-step"               gfloat                : Read / Write / Construct Only

Increment for range steps.

Allowed values: [-1e+07,1e+07]

Default value: 0

@@ -146,7 +146,7 @@

The "value" property

-
  "value"                    gfloat                : Read / Write
+
  "value"                    gfloat                : Read / Write

Current control value.

Allowed values: [-1e+07,1e+07]

Default value: 0

@@ -155,6 +155,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19
\ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleControlText.html entangle-0.5.2/docs/reference/html/EntangleControlText.html --- entangle-0.5.1/docs/reference/html/EntangleControlText.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleControlText.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleControlText - + - + @@ -47,13 +47,13 @@ int id, const char *label, const char *info, - gboolean readonly); + gboolean readonly);

Object Hierarchy

-  GObject
+  GObject
    +----EntangleControl
          +----EntangleControlText
@@ -61,7 +61,7 @@

Properties

-  "value"                    gchar*                : Read / Write
+  "value"                    gchar*                : Read / Write
@@ -88,14 +88,14 @@ int id, const char *label, const char *info, - gboolean readonly); + gboolean readonly);

Property Details

The "value" property

-
  "value"                    gchar*                : Read / Write
+
  "value"                    gchar*                : Read / Write

Current value of the control.

Default value: NULL

@@ -103,6 +103,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19
\ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleControlToggle.html entangle-0.5.2/docs/reference/html/EntangleControlToggle.html --- entangle-0.5.1/docs/reference/html/EntangleControlToggle.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleControlToggle.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleControlToggle - + - + @@ -47,13 +47,13 @@ int id, const char *label, const char *info, - gboolean readonly); + gboolean readonly);

Object Hierarchy

-  GObject
+  GObject
    +----EntangleControl
          +----EntangleControlToggle
@@ -61,7 +61,7 @@

Properties

-  "value"                    gboolean              : Read / Write
+  "value"                    gboolean              : Read / Write
@@ -88,14 +88,14 @@ int id, const char *label, const char *info, - gboolean readonly); + gboolean readonly);

Property Details

The "value" property

-
  "value"                    gboolean              : Read / Write
+
  "value"                    gboolean              : Read / Write

Current value of the control.

Default value: FALSE

@@ -103,6 +103,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleDeviceManager.html entangle-0.5.2/docs/reference/html/EntangleDeviceManager.html --- entangle-0.5.1/docs/reference/html/EntangleDeviceManager.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleDeviceManager.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleDeviceManager - + - + @@ -43,9 +43,9 @@

Synopsis

struct              EntangleDeviceManager;
 struct              EntangleDeviceManagerClass;
-gboolean            entangle_device_manager_has_port    (EntangleDeviceManager *manager,
-                                                         const char *port);
 EntangleDeviceManager * entangle_device_manager_new     (void);
+gboolean            entangle_device_manager_has_port    (EntangleDeviceManager *manager,
+                                                         const char *port);
 char *              entangle_device_manager_port_serial (EntangleDeviceManager *manager,
                                                          const char *port);
@@ -53,15 +53,15 @@

Object Hierarchy

-  GObject
+  GObject
    +----EntangleDeviceManager

Signals

-  "device-added"                                   : Run First
-  "device-removed"                                 : Run First
+  "device-added"                                   : Run First
+  "device-removed"                                 : Run First
@@ -86,14 +86,14 @@
-

entangle_device_manager_has_port ()

-
gboolean            entangle_device_manager_has_port    (EntangleDeviceManager *manager,
-                                                         const char *port);
+

entangle_device_manager_new ()

+
EntangleDeviceManager * entangle_device_manager_new     (void);
-

entangle_device_manager_new ()

-
EntangleDeviceManager * entangle_device_manager_new     (void);
+

entangle_device_manager_has_port ()

+
gboolean            entangle_device_manager_has_port    (EntangleDeviceManager *manager,
+                                                         const char *port);
@@ -107,20 +107,20 @@

The "device-added" signal

void                user_function                      (EntangleDeviceManager *entangledevicemanager,
-                                                        gchar                 *arg1,
-                                                        gpointer               user_data)                  : Run First
+ gchar *arg1, + gpointer user_data) : Run First

The "device-removed" signal

void                user_function                      (EntangleDeviceManager *entangledevicemanager,
-                                                        gchar                 *arg1,
-                                                        gpointer               user_data)                  : Run First
+ gchar *arg1, + gpointer user_data) : Run First
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleHelpAbout.html entangle-0.5.2/docs/reference/html/EntangleHelpAbout.html --- entangle-0.5.1/docs/reference/html/EntangleHelpAbout.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleHelpAbout.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleHelpAbout - + - + @@ -41,16 +41,16 @@

Synopsis

struct              EntangleHelpAbout;
 struct              EntangleHelpAboutClass;
-GtkWindow *         entangle_help_about_get_window      (EntangleHelpAbout *about);
-void                entangle_help_about_hide            (EntangleHelpAbout *about);
 EntangleHelpAbout * entangle_help_about_new             (void);
+GtkWindow *         entangle_help_about_get_window      (EntangleHelpAbout *about);
 void                entangle_help_about_show            (EntangleHelpAbout *about);
+void                entangle_help_about_hide            (EntangleHelpAbout *about);

Object Hierarchy

-  GObject
+  GObject
    +----EntangleHelpAbout
@@ -75,28 +75,28 @@
-

entangle_help_about_get_window ()

-
GtkWindow *         entangle_help_about_get_window      (EntangleHelpAbout *about);
+

entangle_help_about_new ()

+
EntangleHelpAbout * entangle_help_about_new             (void);
-

entangle_help_about_hide ()

-
void                entangle_help_about_hide            (EntangleHelpAbout *about);
+

entangle_help_about_get_window ()

+
GtkWindow *         entangle_help_about_get_window      (EntangleHelpAbout *about);
-

entangle_help_about_new ()

-
EntangleHelpAbout * entangle_help_about_new             (void);
+

entangle_help_about_show ()

+
void                entangle_help_about_show            (EntangleHelpAbout *about);
-

entangle_help_about_show ()

-
void                entangle_help_about_show            (EntangleHelpAbout *about);
+

entangle_help_about_hide ()

+
void                entangle_help_about_hide            (EntangleHelpAbout *about);
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleImage.html entangle-0.5.2/docs/reference/html/EntangleImage.html --- entangle-0.5.1/docs/reference/html/EntangleImage.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleImage.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleImage - + - + @@ -43,32 +43,32 @@

Synopsis

struct              EntangleImage;
 struct              EntangleImageClass;
-gboolean            entangle_image_delete               (EntangleImage *image,
-                                                         GError **error);
-off_t               entangle_image_get_file_size        (EntangleImage *image);
+EntangleImage *     entangle_image_new_file             (const char *filename);
+EntangleImage *     entangle_image_new_pixbuf           (GdkPixbuf *pixbuf);
 const char *        entangle_image_get_filename         (EntangleImage *image);
 time_t              entangle_image_get_last_modified    (EntangleImage *image);
-GExiv2Metadata *    entangle_image_get_metadata         (EntangleImage *image);
+off_t               entangle_image_get_file_size        (EntangleImage *image);
+gboolean            entangle_image_delete               (EntangleImage *image,
+                                                         GError **error);
 GdkPixbuf *         entangle_image_get_pixbuf           (EntangleImage *image);
-EntangleImage *     entangle_image_new_file             (const char *filename);
-EntangleImage *     entangle_image_new_pixbuf           (GdkPixbuf *pixbuf);
-void                entangle_image_set_metadata         (EntangleImage *image,
-                                                         GExiv2Metadata *metadata);
 void                entangle_image_set_pixbuf           (EntangleImage *image,
                                                          GdkPixbuf *pixbuf);
+GExiv2Metadata *    entangle_image_get_metadata         (EntangleImage *image);
+void                entangle_image_set_metadata         (EntangleImage *image,
+                                                         GExiv2Metadata *metadata);

Object Hierarchy

-  GObject
+  GObject
    +----EntangleImage

Properties

-  "filename"                 gchar*                : Read / Write / Construct Only
+  "filename"                 gchar*                : Read / Write / Construct Only
   "metadata"                 GExiv2Metadata*       : Read / Write
   "pixbuf"                   GdkPixbuf*            : Read / Write
@@ -92,14 +92,13 @@
-

entangle_image_delete ()

-
gboolean            entangle_image_delete               (EntangleImage *image,
-                                                         GError **error);
+

entangle_image_new_file ()

+
EntangleImage *     entangle_image_new_file             (const char *filename);
-

entangle_image_get_file_size ()

-
off_t               entangle_image_get_file_size        (EntangleImage *image);
+

entangle_image_new_pixbuf ()

+
EntangleImage *     entangle_image_new_pixbuf           (GdkPixbuf *pixbuf);
@@ -113,8 +112,14 @@
-

entangle_image_get_metadata ()

-
GExiv2Metadata *    entangle_image_get_metadata         (EntangleImage *image);
+

entangle_image_get_file_size ()

+
off_t               entangle_image_get_file_size        (EntangleImage *image);
+
+
+
+

entangle_image_delete ()

+
gboolean            entangle_image_delete               (EntangleImage *image,
+                                                         GError **error);
@@ -123,13 +128,14 @@
-

entangle_image_new_file ()

-
EntangleImage *     entangle_image_new_file             (const char *filename);
+

entangle_image_set_pixbuf ()

+
void                entangle_image_set_pixbuf           (EntangleImage *image,
+                                                         GdkPixbuf *pixbuf);
-

entangle_image_new_pixbuf ()

-
EntangleImage *     entangle_image_new_pixbuf           (GdkPixbuf *pixbuf);
+

entangle_image_get_metadata ()

+
GExiv2Metadata *    entangle_image_get_metadata         (EntangleImage *image);
@@ -137,18 +143,12 @@ 
void                entangle_image_set_metadata         (EntangleImage *image,
                                                          GExiv2Metadata *metadata);
-
-
-

entangle_image_set_pixbuf ()

-
void                entangle_image_set_pixbuf           (EntangleImage *image,
-                                                         GdkPixbuf *pixbuf);
-

Property Details

The "filename" property

-
  "filename"                 gchar*                : Read / Write / Construct Only
+
  "filename"                 gchar*                : Read / Write / Construct Only

Full path to image file.

Default value: NULL

@@ -168,6 +168,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleImageDisplay.html entangle-0.5.2/docs/reference/html/EntangleImageDisplay.html --- entangle-0.5.1/docs/reference/html/EntangleImageDisplay.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleImageDisplay.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleImageDisplay - + - + @@ -45,58 +45,59 @@

Synopsis

struct              EntangleImageDisplay;
 struct              EntangleImageDisplayClass;
-enum                EntangleImageDisplayGrid;
-gdouble             entangle_image_display_get_aspect_ratio
-                                                        (EntangleImageDisplay *display);
-gboolean            entangle_image_display_get_autoscale
-                                                        (EntangleImageDisplay *display);
-gboolean            entangle_image_display_get_focus_point
-                                                        (EntangleImageDisplay *display);
-EntangleImageDisplayGrid entangle_image_display_get_grid_display
-                                                        (EntangleImageDisplay *display);
+EntangleImageDisplay * entangle_image_display_new       (void);
+void                entangle_image_display_set_image    (EntangleImageDisplay *display,
+                                                         EntangleImage *image);
 EntangleImage *     entangle_image_display_get_image    (EntangleImageDisplay *display);
-GList *             entangle_image_display_get_image_list
-                                                        (EntangleImageDisplay *display);
-gboolean            entangle_image_display_get_mask_enabled
+void                entangle_image_display_set_image_list
+                                                        (EntangleImageDisplay *display,
+                                                         GList *image);
+GList *             entangle_image_display_get_image_list
                                                         (EntangleImageDisplay *display);
-gdouble             entangle_image_display_get_mask_opacity
+void                entangle_image_display_set_autoscale
+                                                        (EntangleImageDisplay *displsy,
+                                                         gboolean autoscale);
+gboolean            entangle_image_display_get_autoscale
                                                         (EntangleImageDisplay *display);
-gdouble             entangle_image_display_get_scale    (EntangleImageDisplay *display);
-EntangleImageDisplay * entangle_image_display_new       (void);
+void                entangle_image_display_set_scale    (EntangleImageDisplay *display,
+                                                         gdouble scale);
+gdouble             entangle_image_display_get_scale    (EntangleImageDisplay *display);
 void                entangle_image_display_set_aspect_ratio
                                                         (EntangleImageDisplay *display,
-                                                         gdouble aspect);
-void                entangle_image_display_set_autoscale
-                                                        (EntangleImageDisplay *displsy,
-                                                         gboolean autoscale);
+                                                         gdouble aspect);
+gdouble             entangle_image_display_get_aspect_ratio
+                                                        (EntangleImageDisplay *display);
+void                entangle_image_display_set_mask_opacity
+                                                        (EntangleImageDisplay *display,
+                                                         gdouble opacity);
+gdouble             entangle_image_display_get_mask_opacity
+                                                        (EntangleImageDisplay *display);
+void                entangle_image_display_set_mask_enabled
+                                                        (EntangleImageDisplay *display,
+                                                         gboolean enabled);
+gboolean            entangle_image_display_get_mask_enabled
+                                                        (EntangleImageDisplay *display);
 void                entangle_image_display_set_focus_point
                                                         (EntangleImageDisplay *display,
-                                                         gboolean enabled);
+                                                         gboolean enabled);
+gboolean            entangle_image_display_get_focus_point
+                                                        (EntangleImageDisplay *display);
+gboolean            entangle_image_display_get_loaded   (EntangleImageDisplay *display);
+enum                EntangleImageDisplayGrid;
 void                entangle_image_display_set_grid_display
                                                         (EntangleImageDisplay *display,
                                                          EntangleImageDisplayGrid mode);
-void                entangle_image_display_set_image    (EntangleImageDisplay *display,
-                                                         EntangleImage *image);
-void                entangle_image_display_set_image_list
-                                                        (EntangleImageDisplay *display,
-                                                         GList *image);
-void                entangle_image_display_set_mask_enabled
-                                                        (EntangleImageDisplay *display,
-                                                         gboolean enabled);
-void                entangle_image_display_set_mask_opacity
-                                                        (EntangleImageDisplay *display,
-                                                         gdouble opacity);
-void                entangle_image_display_set_scale    (EntangleImageDisplay *display,
-                                                         gdouble scale);
+EntangleImageDisplayGrid entangle_image_display_get_grid_display
+                                                        (EntangleImageDisplay *display);

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
-         +----GtkWidget
-               +----GtkDrawingArea
+  GObject
+   +----GInitiallyUnowned
+         +----GtkWidget
+               +----GtkDrawingArea
                      +----EntangleImageDisplay
 
@@ -108,19 +109,19 @@
 
Implemented Interfaces

 

 EntangleImageDisplay implements
- AtkImplementorIface and  GtkBuildable.

+ AtkImplementorIface and  GtkBuildable.

Properties

-  "aspect-ratio"             gfloat                : Read / Write
-  "autoscale"                gboolean              : Read / Write
-  "focus-point"              gboolean              : Read / Write
+  "aspect-ratio"             gfloat                : Read / Write
+  "autoscale"                gboolean              : Read / Write
+  "focus-point"              gboolean              : Read / Write
   "grid-display"             EntangleImageDisplayGrid  : Read / Write
   "image"                    EntangleImage*        : Read / Write
-  "mask-enabled"             gboolean              : Read / Write
-  "mask-opacity"             gfloat                : Read / Write
-  "scale"                    gfloat                : Read / Write
+  "mask-enabled"             gboolean              : Read / Write
+  "mask-opacity"             gfloat                : Read / Write
+  "scale"                    gfloat                : Read / Write
@@ -142,141 +143,178 @@
-

enum EntangleImageDisplayGrid

-
typedef enum {
-    ENTANGLE_IMAGE_DISPLAY_GRID_NONE,
-    ENTANGLE_IMAGE_DISPLAY_GRID_CENTER_LINES,
-    ENTANGLE_IMAGE_DISPLAY_GRID_RULE_OF_3RDS,
-    ENTANGLE_IMAGE_DISPLAY_GRID_QUARTERS,
-    ENTANGLE_IMAGE_DISPLAY_GRID_RULE_OF_5THS,
-    ENTANGLE_IMAGE_DISPLAY_GRID_GOLDEN_SECTIONS,
-} EntangleImageDisplayGrid;
-
+

entangle_image_display_new ()

+
EntangleImageDisplay * entangle_image_display_new       (void);
-

entangle_image_display_get_aspect_ratio ()

-
gdouble             entangle_image_display_get_aspect_ratio
-                                                        (EntangleImageDisplay *display);
+

entangle_image_display_set_image ()

+
void                entangle_image_display_set_image    (EntangleImageDisplay *display,
+                                                         EntangleImage *image);
-

entangle_image_display_get_autoscale ()

-
gboolean            entangle_image_display_get_autoscale
-                                                        (EntangleImageDisplay *display);
+

entangle_image_display_get_image ()

+
EntangleImage *     entangle_image_display_get_image    (EntangleImageDisplay *display);
-

entangle_image_display_get_focus_point ()

-
gboolean            entangle_image_display_get_focus_point
-                                                        (EntangleImageDisplay *display);
+

entangle_image_display_set_image_list ()

+
void                entangle_image_display_set_image_list
+                                                        (EntangleImageDisplay *display,
+                                                         GList *image);
-

entangle_image_display_get_grid_display ()

-
EntangleImageDisplayGrid entangle_image_display_get_grid_display
+
entangle_image_display_get_image_list ()

+
GList *             entangle_image_display_get_image_list
                                                         (EntangleImageDisplay *display);
-

entangle_image_display_get_image ()

-
EntangleImage *     entangle_image_display_get_image    (EntangleImageDisplay *display);
+

entangle_image_display_set_autoscale ()

+
void                entangle_image_display_set_autoscale
+                                                        (EntangleImageDisplay *displsy,
+                                                         gboolean autoscale);
-

entangle_image_display_get_image_list ()

-
GList *             entangle_image_display_get_image_list
+
entangle_image_display_get_autoscale ()

+
gboolean            entangle_image_display_get_autoscale
                                                         (EntangleImageDisplay *display);
-

entangle_image_display_get_mask_enabled ()

-
gboolean            entangle_image_display_get_mask_enabled
-                                                        (EntangleImageDisplay *display);
+

entangle_image_display_set_scale ()

+
void                entangle_image_display_set_scale    (EntangleImageDisplay *display,
+                                                         gdouble scale);
-

entangle_image_display_get_mask_opacity ()

-
gdouble             entangle_image_display_get_mask_opacity
-                                                        (EntangleImageDisplay *display);
+

entangle_image_display_get_scale ()

+
gdouble             entangle_image_display_get_scale    (EntangleImageDisplay *display);
-

entangle_image_display_get_scale ()

-
gdouble             entangle_image_display_get_scale    (EntangleImageDisplay *display);
+

entangle_image_display_set_aspect_ratio ()

+
void                entangle_image_display_set_aspect_ratio
+                                                        (EntangleImageDisplay *display,
+                                                         gdouble aspect);
-

entangle_image_display_new ()

-
EntangleImageDisplay * entangle_image_display_new       (void);
+

entangle_image_display_get_aspect_ratio ()

+
gdouble             entangle_image_display_get_aspect_ratio
+                                                        (EntangleImageDisplay *display);
-

entangle_image_display_set_aspect_ratio ()

-
void                entangle_image_display_set_aspect_ratio
+
entangle_image_display_set_mask_opacity ()

+
void                entangle_image_display_set_mask_opacity
                                                         (EntangleImageDisplay *display,
-                                                         gdouble aspect);

+                                                         gdouble opacity);
-

entangle_image_display_set_autoscale ()

-
void                entangle_image_display_set_autoscale
-                                                        (EntangleImageDisplay *displsy,
-                                                         gboolean autoscale);
+

entangle_image_display_get_mask_opacity ()

+
gdouble             entangle_image_display_get_mask_opacity
+                                                        (EntangleImageDisplay *display);
-

entangle_image_display_set_focus_point ()

-
void                entangle_image_display_set_focus_point
+
entangle_image_display_set_mask_enabled ()

+
void                entangle_image_display_set_mask_enabled
                                                         (EntangleImageDisplay *display,
-                                                         gboolean enabled);

+                                                         gboolean enabled);
-

entangle_image_display_set_grid_display ()

-
void                entangle_image_display_set_grid_display
+
entangle_image_display_get_mask_enabled ()

+
gboolean            entangle_image_display_get_mask_enabled
+                                                        (EntangleImageDisplay *display);

+
+
+
+

entangle_image_display_set_focus_point ()

+
void                entangle_image_display_set_focus_point
                                                         (EntangleImageDisplay *display,
-                                                         EntangleImageDisplayGrid mode);
+ gboolean enabled);
-

entangle_image_display_set_image ()

-
void                entangle_image_display_set_image    (EntangleImageDisplay *display,
-                                                         EntangleImage *image);
+

entangle_image_display_get_focus_point ()

+
gboolean            entangle_image_display_get_focus_point
+                                                        (EntangleImageDisplay *display);
-

entangle_image_display_set_image_list ()

-
void                entangle_image_display_set_image_list
-                                                        (EntangleImageDisplay *display,
-                                                         GList *image);
+

entangle_image_display_get_loaded ()

+
gboolean            entangle_image_display_get_loaded   (EntangleImageDisplay *display);
-

entangle_image_display_set_mask_enabled ()

-
void                entangle_image_display_set_mask_enabled
-                                                        (EntangleImageDisplay *display,
-                                                         gboolean enabled);
+

enum EntangleImageDisplayGrid

+
typedef enum {
+    ENTANGLE_IMAGE_DISPLAY_GRID_NONE,
+    ENTANGLE_IMAGE_DISPLAY_GRID_CENTER_LINES,
+    ENTANGLE_IMAGE_DISPLAY_GRID_RULE_OF_3RDS,
+    ENTANGLE_IMAGE_DISPLAY_GRID_QUARTERS,
+    ENTANGLE_IMAGE_DISPLAY_GRID_RULE_OF_5THS,
+    ENTANGLE_IMAGE_DISPLAY_GRID_GOLDEN_SECTIONS,
+} EntangleImageDisplayGrid;
+
+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + +

ENTANGLE_IMAGE_DISPLAY_GRID_NONE

ENTANGLE_IMAGE_DISPLAY_GRID_CENTER_LINES

ENTANGLE_IMAGE_DISPLAY_GRID_RULE_OF_3RDS

ENTANGLE_IMAGE_DISPLAY_GRID_QUARTERS

ENTANGLE_IMAGE_DISPLAY_GRID_RULE_OF_5THS

ENTANGLE_IMAGE_DISPLAY_GRID_GOLDEN_SECTIONS

-

entangle_image_display_set_mask_opacity ()

-
void                entangle_image_display_set_mask_opacity
+
entangle_image_display_set_grid_display ()

+
void                entangle_image_display_set_grid_display
                                                         (EntangleImageDisplay *display,
-                                                         gdouble opacity);

+                                                         EntangleImageDisplayGrid mode);
-

entangle_image_display_set_scale ()

-
void                entangle_image_display_set_scale    (EntangleImageDisplay *display,
-                                                         gdouble scale);
+

entangle_image_display_get_grid_display ()

+
EntangleImageDisplayGrid entangle_image_display_get_grid_display
+                                                        (EntangleImageDisplay *display);

Property Details

The "aspect-ratio" property

-
  "aspect-ratio"             gfloat                : Read / Write
+
  "aspect-ratio"             gfloat                : Read / Write

Aspect ratio to mask image to.

Allowed values: [0,100]

Default value: 1.69

@@ -284,14 +322,14 @@

The "autoscale" property

-
  "autoscale"                gboolean              : Read / Write
+
  "autoscale"                gboolean              : Read / Write

Automatically scale image to fit available area.

Default value: TRUE

The "focus-point" property

-
  "focus-point"              gboolean              : Read / Write
+
  "focus-point"              gboolean              : Read / Write

Overlay center focus point.

Default value: FALSE

@@ -311,14 +349,14 @@

The "mask-enabled" property

-
  "mask-enabled"             gboolean              : Read / Write
+
  "mask-enabled"             gboolean              : Read / Write

Enable aspect ratio image mask.

Default value: FALSE

The "mask-opacity" property

-
  "mask-opacity"             gfloat                : Read / Write
+
  "mask-opacity"             gfloat                : Read / Write

Mask opacity when adjusting aspect ratio.

Allowed values: [0,1]

Default value: 0.5

@@ -326,7 +364,7 @@

The "scale" property

-
  "scale"                    gfloat                : Read / Write
+
  "scale"                    gfloat                : Read / Write

Scale factor for image, 0-1 for zoom out, 1->32 for zoom in.

Allowed values: [0,32]

Default value: 0

@@ -335,6 +373,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19
\ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleImageHistogram.html entangle-0.5.2/docs/reference/html/EntangleImageHistogram.html --- entangle-0.5.1/docs/reference/html/EntangleImageHistogram.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleImageHistogram.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleImageHistogram - + - + @@ -45,19 +45,24 @@

Synopsis

struct              EntangleImageHistogram;
 struct              EntangleImageHistogramClass;
-EntangleImage *     entangle_image_histogram_get_image  (EntangleImageHistogram *histogram);
 EntangleImageHistogram * entangle_image_histogram_new   (void);
 void                entangle_image_histogram_set_image  (EntangleImageHistogram *histogram,
                                                          EntangleImage *image);
+EntangleImage *     entangle_image_histogram_get_image  (EntangleImageHistogram *histogram);
+void                entangle_image_histogram_set_histogram_linear
+                                                        (EntangleImageHistogram *histogram,
+                                                         gboolean linear);
+gboolean            entangle_image_histogram_get_histogram_linear
+                                                        (EntangleImageHistogram *histogram);

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
-         +----GtkWidget
-               +----GtkDrawingArea
+  GObject
+   +----GInitiallyUnowned
+         +----GtkWidget
+               +----GtkDrawingArea
                      +----EntangleImageHistogram
@@ -65,7 +70,7 @@

Implemented Interfaces

EntangleImageHistogram implements - AtkImplementorIface and GtkBuildable.

+ AtkImplementorIface and GtkBuildable.

Properties

@@ -92,11 +97,6 @@
-

entangle_image_histogram_get_image ()

-
EntangleImage *     entangle_image_histogram_get_image  (EntangleImageHistogram *histogram);
-
-
-

entangle_image_histogram_new ()

EntangleImageHistogram * entangle_image_histogram_new   (void);
@@ -106,6 +106,24 @@ 
void                entangle_image_histogram_set_image  (EntangleImageHistogram *histogram,
                                                          EntangleImage *image);
+
+
+

entangle_image_histogram_get_image ()

+
EntangleImage *     entangle_image_histogram_get_image  (EntangleImageHistogram *histogram);
+
+
+
+

entangle_image_histogram_set_histogram_linear ()

+
void                entangle_image_histogram_set_histogram_linear
+                                                        (EntangleImageHistogram *histogram,
+                                                         gboolean linear);
+
+
+
+

entangle_image_histogram_get_histogram_linear ()

+
gboolean            entangle_image_histogram_get_histogram_linear
+                                                        (EntangleImageHistogram *histogram);
+

Property Details

@@ -118,6 +136,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleImageLoader.html entangle-0.5.2/docs/reference/html/EntangleImageLoader.html --- entangle-0.5.1/docs/reference/html/EntangleImageLoader.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleImageLoader.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleImageLoader - + - + @@ -43,22 +43,22 @@

Synopsis

struct              EntangleImageLoader;
 struct              EntangleImageLoaderClass;
+EntangleImageLoader * entangle_image_loader_new         (void);
 void                entangle_image_loader_add           (EntangleImageLoader *loader,
                                                          EntangleImage *image);
-gboolean            entangle_image_loader_get_embedded_preview
-                                                        (EntangleImageLoader *loader);
-EntangleImageLoader * entangle_image_loader_new         (void);
 void                entangle_image_loader_remove        (EntangleImageLoader *loader,
                                                          EntangleImage *image);
+gboolean            entangle_image_loader_get_embedded_preview
+                                                        (EntangleImageLoader *loader);
 void                entangle_image_loader_set_embedded_preview
                                                         (EntangleImageLoader *loader,
-                                                         gboolean enable);
+                                                         gboolean enable);

Object Hierarchy

-  GObject
+  GObject
    +----EntanglePixbufLoader
          +----EntangleImageLoader
@@ -66,7 +66,7 @@

Properties

-  "embedded-preview"         gboolean              : Read / Write / Construct Only
+  "embedded-preview"         gboolean              : Read / Write / Construct Only
@@ -88,20 +88,14 @@
-

entangle_image_loader_add ()

-
void                entangle_image_loader_add           (EntangleImageLoader *loader,
-                                                         EntangleImage *image);
-
-
-
-

entangle_image_loader_get_embedded_preview ()

-
gboolean            entangle_image_loader_get_embedded_preview
-                                                        (EntangleImageLoader *loader);
+

entangle_image_loader_new ()

+
EntangleImageLoader * entangle_image_loader_new         (void);
-

entangle_image_loader_new ()

-
EntangleImageLoader * entangle_image_loader_new         (void);
+

entangle_image_loader_add ()

+
void                entangle_image_loader_add           (EntangleImageLoader *loader,
+                                                         EntangleImage *image);
@@ -111,17 +105,23 @@
+

entangle_image_loader_get_embedded_preview ()

+
gboolean            entangle_image_loader_get_embedded_preview
+                                                        (EntangleImageLoader *loader);
+
+
+

entangle_image_loader_set_embedded_preview ()

void                entangle_image_loader_set_embedded_preview
                                                         (EntangleImageLoader *loader,
-                                                         gboolean enable);
+ gboolean enable);

Property Details

The "embedded-preview" property

-
  "embedded-preview"         gboolean              : Read / Write / Construct Only
+
  "embedded-preview"         gboolean              : Read / Write / Construct Only

Use embedded preview.

Default value: FALSE

@@ -129,6 +129,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleImagePopup.html entangle-0.5.2/docs/reference/html/EntangleImagePopup.html --- entangle-0.5.1/docs/reference/html/EntangleImagePopup.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleImagePopup.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleImagePopup - + - + @@ -45,27 +45,27 @@

Synopsis

struct              EntangleImagePopup;
 struct              EntangleImagePopupClass;
-EntangleImage *     entangle_image_popup_get_image      (EntangleImagePopup *popup);
-void                entangle_image_popup_hide           (EntangleImagePopup *popup);
-void                entangle_image_popup_move_to_monitor
-                                                        (EntangleImagePopup *popup,
-                                                         gint monitor);
 EntangleImagePopup * entangle_image_popup_new           (void);
-void                entangle_image_popup_set_image      (EntangleImagePopup *popup,
-                                                         EntangleImage *image);
 void                entangle_image_popup_show           (EntangleImagePopup *popup,
-                                                         GtkWindow *parent,
+                                                         GtkWindow *parent,
                                                          int x,
                                                          int y);
+void                entangle_image_popup_move_to_monitor
+                                                        (EntangleImagePopup *popup,
+                                                         gint monitor);
 void                entangle_image_popup_show_on_monitor
                                                         (EntangleImagePopup *popup,
-                                                         gint monitor);
+                                                         gint monitor);
+void                entangle_image_popup_hide           (EntangleImagePopup *popup);
+void                entangle_image_popup_set_image      (EntangleImagePopup *popup,
+                                                         EntangleImage *image);
+EntangleImage *     entangle_image_popup_get_image      (EntangleImagePopup *popup);

Object Hierarchy

-  GObject
+  GObject
    +----EntangleImagePopup
@@ -78,7 +78,7 @@

Signals

-  "popup-close"                                    : Run First
+  "popup-close"                                    : Run First
@@ -102,46 +102,46 @@
-

entangle_image_popup_get_image ()

-
EntangleImage *     entangle_image_popup_get_image      (EntangleImagePopup *popup);
+

entangle_image_popup_new ()

+
EntangleImagePopup * entangle_image_popup_new           (void);
-

entangle_image_popup_hide ()

-
void                entangle_image_popup_hide           (EntangleImagePopup *popup);
+

entangle_image_popup_show ()

+
void                entangle_image_popup_show           (EntangleImagePopup *popup,
+                                                         GtkWindow *parent,
+                                                         int x,
+                                                         int y);

entangle_image_popup_move_to_monitor ()

void                entangle_image_popup_move_to_monitor
                                                         (EntangleImagePopup *popup,
-                                                         gint monitor);
+ gint monitor);
-

entangle_image_popup_new ()

-
EntangleImagePopup * entangle_image_popup_new           (void);
+

entangle_image_popup_show_on_monitor ()

+
void                entangle_image_popup_show_on_monitor
+                                                        (EntangleImagePopup *popup,
+                                                         gint monitor);
-

entangle_image_popup_set_image ()

-
void                entangle_image_popup_set_image      (EntangleImagePopup *popup,
-                                                         EntangleImage *image);
+

entangle_image_popup_hide ()

+
void                entangle_image_popup_hide           (EntangleImagePopup *popup);
-

entangle_image_popup_show ()

-
void                entangle_image_popup_show           (EntangleImagePopup *popup,
-                                                         GtkWindow *parent,
-                                                         int x,
-                                                         int y);
+

entangle_image_popup_set_image ()

+
void                entangle_image_popup_set_image      (EntangleImagePopup *popup,
+                                                         EntangleImage *image);
-

entangle_image_popup_show_on_monitor ()

-
void                entangle_image_popup_show_on_monitor
-                                                        (EntangleImagePopup *popup,
-                                                         gint monitor);
+

entangle_image_popup_get_image ()

+
EntangleImage *     entangle_image_popup_get_image      (EntangleImagePopup *popup);
@@ -157,12 +157,12 @@

The "popup-close" signal

void                user_function                      (EntangleImagePopup *entangleimagepopup,
-                                                        gpointer            user_data)               : Run First
+ gpointer user_data) : Run First
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleImageStatusbar.html entangle-0.5.2/docs/reference/html/EntangleImageStatusbar.html --- entangle-0.5.1/docs/reference/html/EntangleImageStatusbar.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleImageStatusbar.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleImageStatusbar - + - + @@ -45,21 +45,21 @@

Synopsis

struct              EntangleImageStatusbar;
 struct              EntangleImageStatusbarClass;
-EntangleImage *     entangle_image_statusbar_get_image  (EntangleImageStatusbar *statusbar);
 EntangleImageStatusbar * entangle_image_statusbar_new   (void);
 void                entangle_image_statusbar_set_image  (EntangleImageStatusbar *statusbar,
                                                          EntangleImage *image);
+EntangleImage *     entangle_image_statusbar_get_image  (EntangleImageStatusbar *statusbar);

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBin
-                           +----GtkEventBox
+  GObject
+   +----GInitiallyUnowned
+         +----GtkWidget
+               +----GtkContainer
+                     +----GtkBin
+                           +----GtkEventBox
                                  +----EntangleImageStatusbar
@@ -67,7 +67,7 @@

Implemented Interfaces

EntangleImageStatusbar implements - AtkImplementorIface and GtkBuildable.

+ AtkImplementorIface and GtkBuildable.

Properties

@@ -94,11 +94,6 @@
-

entangle_image_statusbar_get_image ()

-
EntangleImage *     entangle_image_statusbar_get_image  (EntangleImageStatusbar *statusbar);
-
-
-

entangle_image_statusbar_new ()

EntangleImageStatusbar * entangle_image_statusbar_new   (void);
@@ -108,6 +103,11 @@ 
void                entangle_image_statusbar_set_image  (EntangleImageStatusbar *statusbar,
                                                          EntangleImage *image);
+
+
+

entangle_image_statusbar_get_image ()

+
EntangleImage *     entangle_image_statusbar_get_image  (EntangleImageStatusbar *statusbar);
+

Property Details

@@ -120,6 +120,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntanglePixbufLoader.html entangle-0.5.2/docs/reference/html/EntanglePixbufLoader.html --- entangle-0.5.1/docs/reference/html/EntanglePixbufLoader.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntanglePixbufLoader.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntanglePixbufLoader - + - + @@ -45,32 +45,32 @@

Synopsis

struct              EntanglePixbufLoader;
 struct              EntanglePixbufLoaderClass;
-EntangleColourProfileTransform * entangle_pixbuf_loader_get_colour_transform
-                                                        (EntanglePixbufLoader *loader);
-GExiv2Metadata *    entangle_pixbuf_loader_get_metadata (EntanglePixbufLoader *loader,
+gboolean            entangle_pixbuf_loader_is_ready     (EntanglePixbufLoader *loader,
                                                          EntangleImage *image);
 GdkPixbuf *         entangle_pixbuf_loader_get_pixbuf   (EntanglePixbufLoader *loader,
                                                          EntangleImage *image);
-int                 entangle_pixbuf_loader_get_workers  (EntanglePixbufLoader *loader);
-gboolean            entangle_pixbuf_loader_is_ready     (EntanglePixbufLoader *loader,
+GExiv2Metadata *    entangle_pixbuf_loader_get_metadata (EntanglePixbufLoader *loader,
                                                          EntangleImage *image);
-gboolean            entangle_pixbuf_loader_load         (EntanglePixbufLoader *loader,
+gboolean            entangle_pixbuf_loader_load         (EntanglePixbufLoader *loader,
                                                          EntangleImage *image);
+gboolean            entangle_pixbuf_loader_unload       (EntanglePixbufLoader *loader,
+                                                         EntangleImage *image);
+void                entangle_pixbuf_loader_trigger_reload
+                                                        (EntanglePixbufLoader *loader);
 void                entangle_pixbuf_loader_set_colour_transform
                                                         (EntanglePixbufLoader *loader,
-                                                         EntangleColourProfileTransform *transform);
+                                                         EntangleColourProfileTransform *transform);
+EntangleColourProfileTransform * entangle_pixbuf_loader_get_colour_transform
+                                                        (EntanglePixbufLoader *loader);
 void                entangle_pixbuf_loader_set_workers  (EntanglePixbufLoader *loader,
                                                          int count);
-void                entangle_pixbuf_loader_trigger_reload
-                                                        (EntanglePixbufLoader *loader);
-gboolean            entangle_pixbuf_loader_unload       (EntanglePixbufLoader *loader,
-                                                         EntangleImage *image);
+int                 entangle_pixbuf_loader_get_workers  (EntanglePixbufLoader *loader);

Object Hierarchy

-  GObject
+  GObject
    +----EntanglePixbufLoader
          +----EntangleImageLoader
          +----EntangleThumbnailLoader
@@ -79,18 +79,18 @@
 

 
Properties

 
-  "colour-transform"         EntangleColourProfileTransform*  : Read / Write
-  "with-metadata"            gboolean              : Read / Write / Construct Only
-  "workers"                  gint                  : Read / Write / Construct Only
+  "colour-transform"         EntangleColourProfileTransform*  : Read / Write
+  "with-metadata"            gboolean              : Read / Write / Construct Only
+  "workers"                  gint                  : Read / Write / Construct Only
 

 

 

 
Signals

 
-  "metadata-loaded"                                : Run First
-  "metadata-unloaded"                              : Run First
-  "pixbuf-loaded"                                  : Run First
-  "pixbuf-unloaded"                                : Run First
+  "metadata-loaded"                                : Run First
+  "metadata-unloaded"                              : Run First
+  "pixbuf-loaded"                                  : Run First
+  "pixbuf-unloaded"                                : Run First
 

 

 

@@ -113,21 +113,15 @@
     void (*pixbuf_unloaded)(EntanglePixbufLoader *loader, EntangleImage *image);
     void (*metadata_unloaded)(EntanglePixbufLoader *loader, EntangleImage *image);
 
-    GdkPixbuf *(*pixbuf_load)(EntanglePixbufLoader *loader, EntangleImage *image);
-    GExiv2Metadata *(*metadata_load)(EntanglePixbufLoader *loader, EntangleImage *image);
+    GdkPixbuf *(*pixbuf_load)(EntanglePixbufLoader *loader, EntangleImage *image,
+                              GExiv2Metadata **metadata);
 };
-

entangle_pixbuf_loader_get_colour_transform ()

-
EntangleColourProfileTransform * entangle_pixbuf_loader_get_colour_transform
-                                                        (EntanglePixbufLoader *loader);
-
-
-
-

entangle_pixbuf_loader_get_metadata ()

-
GExiv2Metadata *    entangle_pixbuf_loader_get_metadata (EntanglePixbufLoader *loader,
+
entangle_pixbuf_loader_is_ready ()

+
gboolean            entangle_pixbuf_loader_is_ready     (EntanglePixbufLoader *loader,
                                                          EntangleImage *image);
@@ -138,65 +132,71 @@
-

entangle_pixbuf_loader_get_workers ()

-
int                 entangle_pixbuf_loader_get_workers  (EntanglePixbufLoader *loader);
+

entangle_pixbuf_loader_get_metadata ()

+
GExiv2Metadata *    entangle_pixbuf_loader_get_metadata (EntanglePixbufLoader *loader,
+                                                         EntangleImage *image);
-

entangle_pixbuf_loader_is_ready ()

-
gboolean            entangle_pixbuf_loader_is_ready     (EntanglePixbufLoader *loader,
+
entangle_pixbuf_loader_load ()

+
gboolean            entangle_pixbuf_loader_load         (EntanglePixbufLoader *loader,
                                                          EntangleImage *image);
-

entangle_pixbuf_loader_load ()

-
gboolean            entangle_pixbuf_loader_load         (EntanglePixbufLoader *loader,
+
entangle_pixbuf_loader_unload ()

+
gboolean            entangle_pixbuf_loader_unload       (EntanglePixbufLoader *loader,
                                                          EntangleImage *image);
+

entangle_pixbuf_loader_trigger_reload ()

+
void                entangle_pixbuf_loader_trigger_reload
+                                                        (EntanglePixbufLoader *loader);
+
+
+

entangle_pixbuf_loader_set_colour_transform ()

void                entangle_pixbuf_loader_set_colour_transform
                                                         (EntanglePixbufLoader *loader,
-                                                         EntangleColourProfileTransform *transform);
+ EntangleColourProfileTransform *transform);
-

entangle_pixbuf_loader_set_workers ()

-
void                entangle_pixbuf_loader_set_workers  (EntanglePixbufLoader *loader,
-                                                         int count);
+

entangle_pixbuf_loader_get_colour_transform ()

+
EntangleColourProfileTransform * entangle_pixbuf_loader_get_colour_transform
+                                                        (EntanglePixbufLoader *loader);
-

entangle_pixbuf_loader_trigger_reload ()

-
void                entangle_pixbuf_loader_trigger_reload
-                                                        (EntanglePixbufLoader *loader);
+

entangle_pixbuf_loader_set_workers ()

+
void                entangle_pixbuf_loader_set_workers  (EntanglePixbufLoader *loader,
+                                                         int count);
-

entangle_pixbuf_loader_unload ()

-
gboolean            entangle_pixbuf_loader_unload       (EntanglePixbufLoader *loader,
-                                                         EntangleImage *image);
+

entangle_pixbuf_loader_get_workers ()

+
int                 entangle_pixbuf_loader_get_workers  (EntanglePixbufLoader *loader);

Property Details

The "colour-transform" property

-
  "colour-transform"         EntangleColourProfileTransform*  : Read / Write
+
  "colour-transform"         EntangleColourProfileTransform*  : Read / Write

Colour profile transformation.

The "with-metadata" property

-
  "with-metadata"            gboolean              : Read / Write / Construct Only
+
  "with-metadata"            gboolean              : Read / Write / Construct Only

Load image metadata.

Default value: FALSE

The "workers" property

-
  "workers"                  gint                  : Read / Write / Construct Only
+
  "workers"                  gint                  : Read / Write / Construct Only

Number of worker threads to load pixbufs.

Allowed values: [1,64]

Default value: 1

@@ -208,33 +208,33 @@

The "metadata-loaded" signal

void                user_function                      (EntanglePixbufLoader *entanglepixbufloader,
                                                         EntangleImage        *arg1,
-                                                        gpointer              user_data)                 : Run First
+ gpointer user_data) : Run First

The "metadata-unloaded" signal

void                user_function                      (EntanglePixbufLoader *entanglepixbufloader,
                                                         EntangleImage        *arg1,
-                                                        gpointer              user_data)                 : Run First
+ gpointer user_data) : Run First

The "pixbuf-loaded" signal

void                user_function                      (EntanglePixbufLoader *entanglepixbufloader,
                                                         EntangleImage        *arg1,
-                                                        gpointer              user_data)                 : Run First
+ gpointer user_data) : Run First

The "pixbuf-unloaded" signal

void                user_function                      (EntanglePixbufLoader *entanglepixbufloader,
                                                         EntangleImage        *arg1,
-                                                        gpointer              user_data)                 : Run First
+ gpointer user_data) : Run First
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntanglePreferences.html entangle-0.5.2/docs/reference/html/EntanglePreferences.html --- entangle-0.5.1/docs/reference/html/EntanglePreferences.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntanglePreferences.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntanglePreferences - + - + @@ -43,141 +43,147 @@

Synopsis

struct              EntanglePreferences;
 struct              EntanglePreferencesClass;
-gboolean            entangle_preferences_capture_get_continuous_preview
-                                                        (EntanglePreferences *prefs);
-gboolean            entangle_preferences_capture_get_delete_file
+EntanglePreferences * entangle_preferences_new          (void);
+gboolean            entangle_preferences_interface_get_auto_connect
                                                         (EntanglePreferences *prefs);
-char *              entangle_preferences_capture_get_filename_pattern
+void                entangle_preferences_interface_set_auto_connect
+                                                        (EntanglePreferences *prefs,
+                                                         gboolean autoconn);
+gboolean            entangle_preferences_interface_get_screen_blank
                                                         (EntanglePreferences *prefs);
-char *              entangle_preferences_capture_get_last_session
+void                entangle_preferences_interface_set_screen_blank
+                                                        (EntanglePreferences *prefs,
+                                                         gboolean blank);
+gchar **            entangle_preferences_interface_get_plugins
                                                         (EntanglePreferences *prefs);
-void                entangle_preferences_capture_set_continuous_preview
+void                entangle_preferences_interface_add_plugin
                                                         (EntanglePreferences *prefs,
-                                                         gboolean enabled);
-void                entangle_preferences_capture_set_delete_file
+                                                         const char *name);
+void                entangle_preferences_interface_remove_plugin
                                                         (EntanglePreferences *prefs,
-                                                         gboolean enabled);
-void                entangle_preferences_capture_set_filename_pattern
+                                                         const char *name);
+gboolean            entangle_preferences_interface_get_histogram_linear
+                                                        (EntanglePreferences *prefs);
+void                entangle_preferences_interface_set_histogram_linear
                                                         (EntanglePreferences *prefs,
-                                                         const gchar *dir);
+                                                         gboolean enabled);
+char *              entangle_preferences_capture_get_last_session
+                                                        (EntanglePreferences *prefs);
 void                entangle_preferences_capture_set_last_session
                                                         (EntanglePreferences *prefs,
-                                                         const gchar *dir);
-gboolean            entangle_preferences_cms_get_detect_system_profile
-                                                        (EntanglePreferences *prefs);
-gboolean            entangle_preferences_cms_get_enabled
-                                                        (EntanglePreferences *prefs);
-EntangleColourProfile * entangle_preferences_cms_get_monitor_profile
+                                                         const gchar *dir);
+char *              entangle_preferences_capture_get_filename_pattern
                                                         (EntanglePreferences *prefs);
-EntangleColourProfileIntent entangle_preferences_cms_get_rendering_intent
+void                entangle_preferences_capture_set_filename_pattern
+                                                        (EntanglePreferences *prefs,
+                                                         const gchar *dir);
+gboolean            entangle_preferences_capture_get_continuous_preview
                                                         (EntanglePreferences *prefs);
-EntangleColourProfile * entangle_preferences_cms_get_rgb_profile
+void                entangle_preferences_capture_set_continuous_preview
+                                                        (EntanglePreferences *prefs,
+                                                         gboolean enabled);
+gboolean            entangle_preferences_capture_get_delete_file
                                                         (EntanglePreferences *prefs);
-void                entangle_preferences_cms_set_detect_system_profile
+void                entangle_preferences_capture_set_delete_file
                                                         (EntanglePreferences *prefs,
-                                                         gboolean enabled);
+                                                         gboolean enabled);
+gboolean            entangle_preferences_cms_get_enabled
+                                                        (EntanglePreferences *prefs);
 void                entangle_preferences_cms_set_enabled
                                                         (EntanglePreferences *prefs,
-                                                         gboolean enabled);
-void                entangle_preferences_cms_set_monitor_profile
-                                                        (EntanglePreferences *prefs,
-                                                         EntangleColourProfile *prof);
-void                entangle_preferences_cms_set_rendering_intent
-                                                        (EntanglePreferences *prefs,
-                                                         EntangleColourProfileIntent intent);
+                                                         gboolean enabled);
+EntangleColourProfile * entangle_preferences_cms_get_rgb_profile
+                                                        (EntanglePreferences *prefs);
 void                entangle_preferences_cms_set_rgb_profile
                                                         (EntanglePreferences *prefs,
-                                                         EntangleColourProfile *prof);
-gchar *             entangle_preferences_img_get_aspect_ratio
-                                                        (EntanglePreferences *prefs);
-gboolean            entangle_preferences_img_get_embedded_preview
-                                                        (EntanglePreferences *prefs);
-gboolean            entangle_preferences_img_get_focus_point
+                                                         EntangleColourProfile *prof);
+EntangleColourProfile * entangle_preferences_cms_get_monitor_profile
                                                         (EntanglePreferences *prefs);
-gint                entangle_preferences_img_get_grid_lines
-                                                        (EntanglePreferences *prefs);
-gboolean            entangle_preferences_img_get_mask_enabled
-                                                        (EntanglePreferences *prefs);
-gint                entangle_preferences_img_get_mask_opacity
+void                entangle_preferences_cms_set_monitor_profile
+                                                        (EntanglePreferences *prefs,
+                                                         EntangleColourProfile *prof);
+gboolean            entangle_preferences_cms_get_detect_system_profile
                                                         (EntanglePreferences *prefs);
-gint                entangle_preferences_img_get_onion_layers
+void                entangle_preferences_cms_set_detect_system_profile
+                                                        (EntanglePreferences *prefs,
+                                                         gboolean enabled);
+EntangleColourProfileIntent entangle_preferences_cms_get_rendering_intent
                                                         (EntanglePreferences *prefs);
-gboolean            entangle_preferences_img_get_onion_skin
+void                entangle_preferences_cms_set_rendering_intent
+                                                        (EntanglePreferences *prefs,
+                                                         EntangleColourProfileIntent intent);
+gchar *             entangle_preferences_img_get_aspect_ratio
                                                         (EntanglePreferences *prefs);
 void                entangle_preferences_img_set_aspect_ratio
                                                         (EntanglePreferences *prefs,
-                                                         const gchar *aspect);
-void                entangle_preferences_img_set_embedded_preview
+                                                         const gchar *aspect);
+gint                entangle_preferences_img_get_mask_opacity
+                                                        (EntanglePreferences *prefs);
+void                entangle_preferences_img_set_mask_opacity
                                                         (EntanglePreferences *prefs,
-                                                         gboolean enabled);
+                                                         gint opacity);
+gboolean            entangle_preferences_img_get_mask_enabled
+                                                        (EntanglePreferences *prefs);
+void                entangle_preferences_img_set_mask_enabled
+                                                        (EntanglePreferences *prefs,
+                                                         gboolean enabled);
+gboolean            entangle_preferences_img_get_focus_point
+                                                        (EntanglePreferences *prefs);
 void                entangle_preferences_img_set_focus_point
                                                         (EntanglePreferences *prefs,
-                                                         gboolean enabled);
+                                                         gboolean enabled);
+gint                entangle_preferences_img_get_grid_lines
+                                                        (EntanglePreferences *prefs);
 void                entangle_preferences_img_set_grid_lines
                                                         (EntanglePreferences *prefs,
-                                                         gint gridLines);
-void                entangle_preferences_img_set_mask_enabled
-                                                        (EntanglePreferences *prefs,
-                                                         gboolean enabled);
-void                entangle_preferences_img_set_mask_opacity
-                                                        (EntanglePreferences *prefs,
-                                                         gint opacity);
-void                entangle_preferences_img_set_onion_layers
+                                                         gint gridLines);
+gboolean            entangle_preferences_img_get_embedded_preview
+                                                        (EntanglePreferences *prefs);
+void                entangle_preferences_img_set_embedded_preview
                                                         (EntanglePreferences *prefs,
-                                                         gint layers);
+                                                         gboolean enabled);
+gboolean            entangle_preferences_img_get_onion_skin
+                                                        (EntanglePreferences *prefs);
 void                entangle_preferences_img_set_onion_skin
                                                         (EntanglePreferences *prefs,
-                                                         gboolean enabled);
-void                entangle_preferences_interface_add_plugin
-                                                        (EntanglePreferences *prefs,
-                                                         const char *name);
-gboolean            entangle_preferences_interface_get_auto_connect
+                                                         gboolean enabled);
+gint                entangle_preferences_img_get_onion_layers
                                                         (EntanglePreferences *prefs);
-gchar **            entangle_preferences_interface_get_plugins
-                                                        (EntanglePreferences *prefs);
-gboolean            entangle_preferences_interface_get_screen_blank
-                                                        (EntanglePreferences *prefs);
-void                entangle_preferences_interface_remove_plugin
-                                                        (EntanglePreferences *prefs,
-                                                         const char *name);
-void                entangle_preferences_interface_set_auto_connect
-                                                        (EntanglePreferences *prefs,
-                                                         gboolean autoconn);
-void                entangle_preferences_interface_set_screen_blank
+void                entangle_preferences_img_set_onion_layers
                                                         (EntanglePreferences *prefs,
-                                                         gboolean blank);
-EntanglePreferences * entangle_preferences_new          (void);
+                                                         gint layers);

Object Hierarchy

-  GObject
+  GObject
    +----EntanglePreferences

Properties

-  "capture-continuous-preview" gboolean              : Read / Write
-  "capture-delete-file"      gboolean              : Read / Write
-  "capture-filename-pattern" gchar*                : Read / Write
-  "capture-last-session"     gchar*                : Read / Write
-  "cms-detect-system-profile" gboolean              : Read / Write
-  "cms-enabled"              gboolean              : Read / Write
-  "cms-monitor-profile"      EntangleColourProfile*  : Read / Write
-  "cms-rendering-intent"     EntangleColourProfileIntent  : Read / Write
-  "cms-rgb-profile"          EntangleColourProfile*  : Read / Write
-  "img-aspect-ratio"         gchar*                : Read / Write
-  "img-embedded-preview"     gboolean              : Read / Write
-  "img-focus-point"          gboolean              : Read / Write
-  "img-grid-lines"           gint                  : Read / Write
-  "img-mask-enabled"         gboolean              : Read / Write
-  "img-mask-opacity"         gint                  : Read / Write
-  "img-onion-layers"         gint                  : Read / Write
-  "img-onion-skin"           gboolean              : Read / Write
-  "interface-auto-connect"   gboolean              : Read / Write
-  "interface-screen-blank"   gboolean              : Read / Write
+  "capture-continuous-preview" gboolean              : Read / Write
+  "capture-delete-file"      gboolean              : Read / Write
+  "capture-filename-pattern" gchar*                : Read / Write
+  "capture-last-session"     gchar*                : Read / Write
+  "cms-detect-system-profile" gboolean              : Read / Write
+  "cms-enabled"              gboolean              : Read / Write
+  "cms-monitor-profile"      EntangleColourProfile*  : Read / Write
+  "cms-rendering-intent"     EntangleColourProfileIntent  : Read / Write
+  "cms-rgb-profile"          EntangleColourProfile*  : Read / Write
+  "img-aspect-ratio"         gchar*                : Read / Write
+  "img-embedded-preview"     gboolean              : Read / Write
+  "img-focus-point"          gboolean              : Read / Write
+  "img-grid-lines"           gint                  : Read / Write
+  "img-mask-enabled"         gboolean              : Read / Write
+  "img-mask-opacity"         gint                  : Read / Write
+  "img-onion-layers"         gint                  : Read / Write
+  "img-onion-skin"           gboolean              : Read / Write
+  "interface-auto-connect"   gboolean              : Read / Write
+  "interface-histogram-linear" gboolean              : Read / Write
+  "interface-screen-blank"   gboolean              : Read / Write
@@ -199,167 +205,189 @@
-

entangle_preferences_capture_get_continuous_preview ()

-
gboolean            entangle_preferences_capture_get_continuous_preview
-                                                        (EntanglePreferences *prefs);
+

entangle_preferences_new ()

+
EntanglePreferences * entangle_preferences_new          (void);
-

entangle_preferences_capture_get_delete_file ()

-
gboolean            entangle_preferences_capture_get_delete_file
+
entangle_preferences_interface_get_auto_connect ()

+
gboolean            entangle_preferences_interface_get_auto_connect
                                                         (EntanglePreferences *prefs);
-

entangle_preferences_capture_get_filename_pattern ()

-
char *              entangle_preferences_capture_get_filename_pattern
+
entangle_preferences_interface_set_auto_connect ()

+
void                entangle_preferences_interface_set_auto_connect
+                                                        (EntanglePreferences *prefs,
+                                                         gboolean autoconn);

+
+
+
+

entangle_preferences_interface_get_screen_blank ()

+
gboolean            entangle_preferences_interface_get_screen_blank
                                                         (EntanglePreferences *prefs);
-

entangle_preferences_capture_get_last_session ()

-
char *              entangle_preferences_capture_get_last_session
+
entangle_preferences_interface_set_screen_blank ()

+
void                entangle_preferences_interface_set_screen_blank
+                                                        (EntanglePreferences *prefs,
+                                                         gboolean blank);

+
+
+
+

entangle_preferences_interface_get_plugins ()

+
gchar **            entangle_preferences_interface_get_plugins
                                                         (EntanglePreferences *prefs);
-

entangle_preferences_capture_set_continuous_preview ()

-
void                entangle_preferences_capture_set_continuous_preview
+
entangle_preferences_interface_add_plugin ()

+
void                entangle_preferences_interface_add_plugin
                                                         (EntanglePreferences *prefs,
-                                                         gboolean enabled);

+                                                         const char *name);
-

entangle_preferences_capture_set_delete_file ()

-
void                entangle_preferences_capture_set_delete_file
+
entangle_preferences_interface_remove_plugin ()

+
void                entangle_preferences_interface_remove_plugin
                                                         (EntanglePreferences *prefs,
-                                                         gboolean enabled);

+                                                         const char *name);
-

entangle_preferences_capture_set_filename_pattern ()

-
void                entangle_preferences_capture_set_filename_pattern
+
entangle_preferences_interface_get_histogram_linear ()

+
gboolean            entangle_preferences_interface_get_histogram_linear
+                                                        (EntanglePreferences *prefs);

+
+
+
+

entangle_preferences_interface_set_histogram_linear ()

+
void                entangle_preferences_interface_set_histogram_linear
                                                         (EntanglePreferences *prefs,
-                                                         const gchar *dir);
+ gboolean enabled); +
+
+
+

entangle_preferences_capture_get_last_session ()

+
char *              entangle_preferences_capture_get_last_session
+                                                        (EntanglePreferences *prefs);

entangle_preferences_capture_set_last_session ()

void                entangle_preferences_capture_set_last_session
                                                         (EntanglePreferences *prefs,
-                                                         const gchar *dir);
+ const gchar *dir);
-

entangle_preferences_cms_get_detect_system_profile ()

-
gboolean            entangle_preferences_cms_get_detect_system_profile
+
entangle_preferences_capture_get_filename_pattern ()

+
char *              entangle_preferences_capture_get_filename_pattern
                                                         (EntanglePreferences *prefs);
-

entangle_preferences_cms_get_enabled ()

-
gboolean            entangle_preferences_cms_get_enabled
-                                                        (EntanglePreferences *prefs);
+

entangle_preferences_capture_set_filename_pattern ()

+
void                entangle_preferences_capture_set_filename_pattern
+                                                        (EntanglePreferences *prefs,
+                                                         const gchar *dir);
-

entangle_preferences_cms_get_monitor_profile ()

-
EntangleColourProfile * entangle_preferences_cms_get_monitor_profile
+
entangle_preferences_capture_get_continuous_preview ()

+
gboolean            entangle_preferences_capture_get_continuous_preview
                                                         (EntanglePreferences *prefs);
-

entangle_preferences_cms_get_rendering_intent ()

-
EntangleColourProfileIntent entangle_preferences_cms_get_rendering_intent
-                                                        (EntanglePreferences *prefs);
+

entangle_preferences_capture_set_continuous_preview ()

+
void                entangle_preferences_capture_set_continuous_preview
+                                                        (EntanglePreferences *prefs,
+                                                         gboolean enabled);
-

entangle_preferences_cms_get_rgb_profile ()

-
EntangleColourProfile * entangle_preferences_cms_get_rgb_profile
+
entangle_preferences_capture_get_delete_file ()

+
gboolean            entangle_preferences_capture_get_delete_file
                                                         (EntanglePreferences *prefs);
-

entangle_preferences_cms_set_detect_system_profile ()

-
void                entangle_preferences_cms_set_detect_system_profile
+
entangle_preferences_capture_set_delete_file ()

+
void                entangle_preferences_capture_set_delete_file
                                                         (EntanglePreferences *prefs,
-                                                         gboolean enabled);

+                                                         gboolean enabled);
-

entangle_preferences_cms_set_enabled ()

-
void                entangle_preferences_cms_set_enabled
-                                                        (EntanglePreferences *prefs,
-                                                         gboolean enabled);
+

entangle_preferences_cms_get_enabled ()

+
gboolean            entangle_preferences_cms_get_enabled
+                                                        (EntanglePreferences *prefs);
-

entangle_preferences_cms_set_monitor_profile ()

-
void                entangle_preferences_cms_set_monitor_profile
+
entangle_preferences_cms_set_enabled ()

+
void                entangle_preferences_cms_set_enabled
                                                         (EntanglePreferences *prefs,
-                                                         EntangleColourProfile *prof);

+                                                         gboolean enabled);
-

entangle_preferences_cms_set_rendering_intent ()

-
void                entangle_preferences_cms_set_rendering_intent
-                                                        (EntanglePreferences *prefs,
-                                                         EntangleColourProfileIntent intent);
+

entangle_preferences_cms_get_rgb_profile ()

+
EntangleColourProfile * entangle_preferences_cms_get_rgb_profile
+                                                        (EntanglePreferences *prefs);

entangle_preferences_cms_set_rgb_profile ()

void                entangle_preferences_cms_set_rgb_profile
                                                         (EntanglePreferences *prefs,
-                                                         EntangleColourProfile *prof);
-
-
-
-

entangle_preferences_img_get_aspect_ratio ()

-
gchar *             entangle_preferences_img_get_aspect_ratio
-                                                        (EntanglePreferences *prefs);
+ EntangleColourProfile *prof);
-

entangle_preferences_img_get_embedded_preview ()

-
gboolean            entangle_preferences_img_get_embedded_preview
+
entangle_preferences_cms_get_monitor_profile ()

+
EntangleColourProfile * entangle_preferences_cms_get_monitor_profile
                                                         (EntanglePreferences *prefs);
-

entangle_preferences_img_get_focus_point ()

-
gboolean            entangle_preferences_img_get_focus_point
-                                                        (EntanglePreferences *prefs);
+

entangle_preferences_cms_set_monitor_profile ()

+
void                entangle_preferences_cms_set_monitor_profile
+                                                        (EntanglePreferences *prefs,
+                                                         EntangleColourProfile *prof);
-

entangle_preferences_img_get_grid_lines ()

-
gint                entangle_preferences_img_get_grid_lines
+
entangle_preferences_cms_get_detect_system_profile ()

+
gboolean            entangle_preferences_cms_get_detect_system_profile
                                                         (EntanglePreferences *prefs);
-

entangle_preferences_img_get_mask_enabled ()

-
gboolean            entangle_preferences_img_get_mask_enabled
-                                                        (EntanglePreferences *prefs);
+

entangle_preferences_cms_set_detect_system_profile ()

+
void                entangle_preferences_cms_set_detect_system_profile
+                                                        (EntanglePreferences *prefs,
+                                                         gboolean enabled);
-

entangle_preferences_img_get_mask_opacity ()

-
gint                entangle_preferences_img_get_mask_opacity
+
entangle_preferences_cms_get_rendering_intent ()

+
EntangleColourProfileIntent entangle_preferences_cms_get_rendering_intent
                                                         (EntanglePreferences *prefs);
-

entangle_preferences_img_get_onion_layers ()

-
gint                entangle_preferences_img_get_onion_layers
-                                                        (EntanglePreferences *prefs);
+

entangle_preferences_cms_set_rendering_intent ()

+
void                entangle_preferences_cms_set_rendering_intent
+                                                        (EntanglePreferences *prefs,
+                                                         EntangleColourProfileIntent intent);
-

entangle_preferences_img_get_onion_skin ()

-
gboolean            entangle_preferences_img_get_onion_skin
+
entangle_preferences_img_get_aspect_ratio ()

+
gchar *             entangle_preferences_img_get_aspect_ratio
                                                         (EntanglePreferences *prefs);
@@ -367,196 +395,187 @@

entangle_preferences_img_set_aspect_ratio ()

void                entangle_preferences_img_set_aspect_ratio
                                                         (EntanglePreferences *prefs,
-                                                         const gchar *aspect);
+ const gchar *aspect);
-

entangle_preferences_img_set_embedded_preview ()

-
void                entangle_preferences_img_set_embedded_preview
-                                                        (EntanglePreferences *prefs,
-                                                         gboolean enabled);
+

entangle_preferences_img_get_mask_opacity ()

+
gint                entangle_preferences_img_get_mask_opacity
+                                                        (EntanglePreferences *prefs);
-

entangle_preferences_img_set_focus_point ()

-
void                entangle_preferences_img_set_focus_point
+
entangle_preferences_img_set_mask_opacity ()

+
void                entangle_preferences_img_set_mask_opacity
                                                         (EntanglePreferences *prefs,
-                                                         gboolean enabled);

+                                                         gint opacity);
-

entangle_preferences_img_set_grid_lines ()

-
void                entangle_preferences_img_set_grid_lines
-                                                        (EntanglePreferences *prefs,
-                                                         gint gridLines);
+

entangle_preferences_img_get_mask_enabled ()

+
gboolean            entangle_preferences_img_get_mask_enabled
+                                                        (EntanglePreferences *prefs);

entangle_preferences_img_set_mask_enabled ()

void                entangle_preferences_img_set_mask_enabled
                                                         (EntanglePreferences *prefs,
-                                                         gboolean enabled);
+ gboolean enabled);
-

entangle_preferences_img_set_mask_opacity ()

-
void                entangle_preferences_img_set_mask_opacity
-                                                        (EntanglePreferences *prefs,
-                                                         gint opacity);
+

entangle_preferences_img_get_focus_point ()

+
gboolean            entangle_preferences_img_get_focus_point
+                                                        (EntanglePreferences *prefs);
-

entangle_preferences_img_set_onion_layers ()

-
void                entangle_preferences_img_set_onion_layers
+
entangle_preferences_img_set_focus_point ()

+
void                entangle_preferences_img_set_focus_point
                                                         (EntanglePreferences *prefs,
-                                                         gint layers);

+                                                         gboolean enabled);
-

entangle_preferences_img_set_onion_skin ()

-
void                entangle_preferences_img_set_onion_skin
-                                                        (EntanglePreferences *prefs,
-                                                         gboolean enabled);
+

entangle_preferences_img_get_grid_lines ()

+
gint                entangle_preferences_img_get_grid_lines
+                                                        (EntanglePreferences *prefs);
-

entangle_preferences_interface_add_plugin ()

-
void                entangle_preferences_interface_add_plugin
+
entangle_preferences_img_set_grid_lines ()

+
void                entangle_preferences_img_set_grid_lines
                                                         (EntanglePreferences *prefs,
-                                                         const char *name);

+                                                         gint gridLines);
-

entangle_preferences_interface_get_auto_connect ()

-
gboolean            entangle_preferences_interface_get_auto_connect
+
entangle_preferences_img_get_embedded_preview ()

+
gboolean            entangle_preferences_img_get_embedded_preview
                                                         (EntanglePreferences *prefs);
-

entangle_preferences_interface_get_plugins ()

-
gchar **            entangle_preferences_interface_get_plugins
-                                                        (EntanglePreferences *prefs);
+

entangle_preferences_img_set_embedded_preview ()

+
void                entangle_preferences_img_set_embedded_preview
+                                                        (EntanglePreferences *prefs,
+                                                         gboolean enabled);
-

entangle_preferences_interface_get_screen_blank ()

-
gboolean            entangle_preferences_interface_get_screen_blank
+
entangle_preferences_img_get_onion_skin ()

+
gboolean            entangle_preferences_img_get_onion_skin
                                                         (EntanglePreferences *prefs);
-

entangle_preferences_interface_remove_plugin ()

-
void                entangle_preferences_interface_remove_plugin
+
entangle_preferences_img_set_onion_skin ()

+
void                entangle_preferences_img_set_onion_skin
                                                         (EntanglePreferences *prefs,
-                                                         const char *name);

+                                                         gboolean enabled);
-

entangle_preferences_interface_set_auto_connect ()

-
void                entangle_preferences_interface_set_auto_connect
-                                                        (EntanglePreferences *prefs,
-                                                         gboolean autoconn);
+

entangle_preferences_img_get_onion_layers ()

+
gint                entangle_preferences_img_get_onion_layers
+                                                        (EntanglePreferences *prefs);
-

entangle_preferences_interface_set_screen_blank ()

-
void                entangle_preferences_interface_set_screen_blank
+
entangle_preferences_img_set_onion_layers ()

+
void                entangle_preferences_img_set_onion_layers
                                                         (EntanglePreferences *prefs,
-                                                         gboolean blank);

-
-
-
-

entangle_preferences_new ()

-
EntanglePreferences * entangle_preferences_new          (void);
+ gint layers);

Property Details

The "capture-continuous-preview" property

-
  "capture-continuous-preview" gboolean              : Read / Write
+
  "capture-continuous-preview" gboolean              : Read / Write

Continue preview after capturing.

Default value: FALSE

The "capture-delete-file" property

-
  "capture-delete-file"      gboolean              : Read / Write
+
  "capture-delete-file"      gboolean              : Read / Write

Delete file after capturing.

Default value: TRUE

The "capture-filename-pattern" property

-
  "capture-filename-pattern" gchar*                : Read / Write
+
  "capture-filename-pattern" gchar*                : Read / Write

Pattern for creating new filenames.

Default value: NULL

The "capture-last-session" property

-
  "capture-last-session"     gchar*                : Read / Write
+
  "capture-last-session"     gchar*                : Read / Write

Directory to store pictures in.

Default value: NULL

The "cms-detect-system-profile" property

-
  "cms-detect-system-profile" gboolean              : Read / Write
+
  "cms-detect-system-profile" gboolean              : Read / Write

Detect the monitor colour profile.

Default value: TRUE

The "cms-enabled" property

-
  "cms-enabled"              gboolean              : Read / Write
+
  "cms-enabled"              gboolean              : Read / Write

Whether to enable colour management on display.

Default value: FALSE

The "cms-monitor-profile" property

-
  "cms-monitor-profile"      EntangleColourProfile*  : Read / Write
+
  "cms-monitor-profile"      EntangleColourProfile*  : Read / Write

Colour profile for monitor.

The "cms-rendering-intent" property

-
  "cms-rendering-intent"     EntangleColourProfileIntent  : Read / Write
+
  "cms-rendering-intent"     EntangleColourProfileIntent  : Read / Write

Rendering intent for images.

Default value: ENTANGLE_COLOUR_PROFILE_INTENT_PERCEPTUAL

The "cms-rgb-profile" property

-
  "cms-rgb-profile"          EntangleColourProfile*  : Read / Write
+
  "cms-rgb-profile"          EntangleColourProfile*  : Read / Write

Colour profile for workspace.

The "img-aspect-ratio" property

-
  "img-aspect-ratio"         gchar*                : Read / Write
+
  "img-aspect-ratio"         gchar*                : Read / Write

Image mask aspect ratio.

Default value: "1.33"

The "img-embedded-preview" property

-
  "img-embedded-preview"     gboolean              : Read / Write
+
  "img-embedded-preview"     gboolean              : Read / Write

Embedded preview for raw files.

Default value: FALSE

The "img-focus-point" property

-
  "img-focus-point"          gboolean              : Read / Write
+
  "img-focus-point"          gboolean              : Read / Write

Focus point during preview.

Default value: FALSE

The "img-grid-lines" property

-
  "img-grid-lines"           gint                  : Read / Write
+
  "img-grid-lines"           gint                  : Read / Write

Grid lines during preview.

Allowed values: [0,4]

Default value: 4

@@ -564,14 +583,14 @@

The "img-mask-enabled" property

-
  "img-mask-enabled"         gboolean              : Read / Write
+
  "img-mask-enabled"         gboolean              : Read / Write

Enable aspect ratio image mask.

Default value: FALSE

The "img-mask-opacity" property

-
  "img-mask-opacity"         gint                  : Read / Write
+
  "img-mask-opacity"         gint                  : Read / Write

Image mask border opacity.

Allowed values: [0,100]

Default value: 90

@@ -579,7 +598,7 @@

The "img-onion-layers" property

-
  "img-onion-layers"         gint                  : Read / Write
+
  "img-onion-layers"         gint                  : Read / Write

Overlay layers in image display.

Allowed values: [1,5]

Default value: 3

@@ -587,21 +606,28 @@

The "img-onion-skin" property

-
  "img-onion-skin"           gboolean              : Read / Write
+
  "img-onion-skin"           gboolean              : Read / Write

Enable image overlay display.

Default value: FALSE

The "interface-auto-connect" property

-
  "interface-auto-connect"   gboolean              : Read / Write
+
  "interface-auto-connect"   gboolean              : Read / Write

Automatically connect to cameras at startup.

Default value: TRUE

+

The "interface-histogram-linear" property

+
  "interface-histogram-linear" gboolean              : Read / Write
+

Use linear histogram.

+

Default value: FALSE

+
+
+

The "interface-screen-blank" property

-
  "interface-screen-blank"   gboolean              : Read / Write
+
  "interface-screen-blank"   gboolean              : Read / Write

Blank screen while capturing images.

Default value: FALSE

@@ -609,6 +635,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19
\ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntanglePreferencesDisplay.html entangle-0.5.2/docs/reference/html/EntanglePreferencesDisplay.html --- entangle-0.5.1/docs/reference/html/EntanglePreferencesDisplay.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntanglePreferencesDisplay.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntanglePreferencesDisplay - + - + @@ -43,19 +43,19 @@

Synopsis

struct              EntanglePreferencesDisplay;
 struct              EntanglePreferencesDisplayClass;
-EntangleApplication * entangle_camera_preferences_get_application
-                                                        (EntanglePreferencesDisplay *preferences);
-GtkWindow *         entangle_preferences_display_get_window
-                                                        (EntanglePreferencesDisplay *preferences);
 EntanglePreferencesDisplay * entangle_preferences_display_new
                                                         (EntangleApplication *application);
+GtkWindow *         entangle_preferences_display_get_window
+                                                        (EntanglePreferencesDisplay *preferences);
 void                entangle_preferences_display_show   (EntanglePreferencesDisplay *preferences);
+EntangleApplication * entangle_camera_preferences_get_application
+                                                        (EntanglePreferencesDisplay *preferences);

Object Hierarchy

-  GObject
+  GObject
    +----EntanglePreferencesDisplay
@@ -84,26 +84,26 @@
-

entangle_camera_preferences_get_application ()

-
EntangleApplication * entangle_camera_preferences_get_application
-                                                        (EntanglePreferencesDisplay *preferences);
+

entangle_preferences_display_new ()

+
EntanglePreferencesDisplay * entangle_preferences_display_new
+                                                        (EntangleApplication *application);

entangle_preferences_display_get_window ()

-
GtkWindow *         entangle_preferences_display_get_window
+
GtkWindow *         entangle_preferences_display_get_window
                                                         (EntanglePreferencesDisplay *preferences);
-

entangle_preferences_display_new ()

-
EntanglePreferencesDisplay * entangle_preferences_display_new
-                                                        (EntangleApplication *application);
+

entangle_preferences_display_show ()

+
void                entangle_preferences_display_show   (EntanglePreferencesDisplay *preferences);
-

entangle_preferences_display_show ()

-
void                entangle_preferences_display_show   (EntanglePreferencesDisplay *preferences);
+

entangle_camera_preferences_get_application ()

+
EntangleApplication * entangle_camera_preferences_get_application
+                                                        (EntanglePreferencesDisplay *preferences);
@@ -117,6 +117,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleSession.html entangle-0.5.2/docs/reference/html/EntangleSession.html --- entangle-0.5.1/docs/reference/html/EntangleSession.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleSession.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleSession - + - + @@ -45,41 +45,41 @@

Synopsis

struct              EntangleSession;
 struct              EntangleSessionClass;
-void                entangle_session_add                (EntangleSession *session,
-                                                         EntangleImage *image);
-const char *        entangle_session_directory          (EntangleSession *session);
-const char *        entangle_session_filename_pattern   (EntangleSession *session);
-int                 entangle_session_image_count        (EntangleSession *session);
-EntangleImage *     entangle_session_image_get          (EntangleSession *session,
-                                                         int idx);
-gboolean            entangle_session_load               (EntangleSession *session);
 EntangleSession *   entangle_session_new                (const char *directory,
                                                          const char *filenamePattern);
+const char *        entangle_session_directory          (EntangleSession *session);
+const char *        entangle_session_filename_pattern   (EntangleSession *session);
 char *              entangle_session_next_filename      (EntangleSession *session,
                                                          EntangleCameraFile *file);
+gboolean            entangle_session_load               (EntangleSession *session);
+void                entangle_session_add                (EntangleSession *session,
+                                                         EntangleImage *image);
 void                entangle_session_remove             (EntangleSession *session,
                                                          EntangleImage *image);
+int                 entangle_session_image_count        (EntangleSession *session);
+EntangleImage *     entangle_session_image_get          (EntangleSession *session,
+                                                         int idx);

Object Hierarchy

-  GObject
+  GObject
    +----EntangleSession

Properties

-  "directory"                gchar*                : Read / Write / Construct Only
-  "filename-pattern"         gchar*                : Read / Write / Construct Only
+  "directory"                gchar*                : Read / Write / Construct Only
+  "filename-pattern"         gchar*                : Read / Write / Construct Only

Signals

-  "session-image-added"                            : Run First
-  "session-image-removed"                          : Run First
+  "session-image-added"                            : Run First
+  "session-image-removed"                          : Run First
@@ -104,9 +104,9 @@
-

entangle_session_add ()

-
void                entangle_session_add                (EntangleSession *session,
-                                                         EntangleImage *image);
+

entangle_session_new ()

+
EntangleSession *   entangle_session_new                (const char *directory,
+                                                         const char *filenamePattern);
@@ -120,51 +120,51 @@
-

entangle_session_image_count ()

-
int                 entangle_session_image_count        (EntangleSession *session);
+

entangle_session_next_filename ()

+
char *              entangle_session_next_filename      (EntangleSession *session,
+                                                         EntangleCameraFile *file);
-

entangle_session_image_get ()

-
EntangleImage *     entangle_session_image_get          (EntangleSession *session,
-                                                         int idx);
+

entangle_session_load ()

+
gboolean            entangle_session_load               (EntangleSession *session);
-

entangle_session_load ()

-
gboolean            entangle_session_load               (EntangleSession *session);
+

entangle_session_add ()

+
void                entangle_session_add                (EntangleSession *session,
+                                                         EntangleImage *image);
-

entangle_session_new ()

-
EntangleSession *   entangle_session_new                (const char *directory,
-                                                         const char *filenamePattern);
+

entangle_session_remove ()

+
void                entangle_session_remove             (EntangleSession *session,
+                                                         EntangleImage *image);
-

entangle_session_next_filename ()

-
char *              entangle_session_next_filename      (EntangleSession *session,
-                                                         EntangleCameraFile *file);
+

entangle_session_image_count ()

+
int                 entangle_session_image_count        (EntangleSession *session);
-

entangle_session_remove ()

-
void                entangle_session_remove             (EntangleSession *session,
-                                                         EntangleImage *image);
+

entangle_session_image_get ()

+
EntangleImage *     entangle_session_image_get          (EntangleSession *session,
+                                                         int idx);

Property Details

The "directory" property

-
  "directory"                gchar*                : Read / Write / Construct Only
+
  "directory"                gchar*                : Read / Write / Construct Only

Full path to session file.

Default value: NULL

The "filename-pattern" property

-
  "filename-pattern"         gchar*                : Read / Write / Construct Only
+
  "filename-pattern"         gchar*                : Read / Write / Construct Only

Pattern for creating new filenames.

Default value: NULL

@@ -175,19 +175,19 @@

The "session-image-added" signal

void                user_function                      (EntangleSession *entanglesession,
                                                         EntangleImage   *arg1,
-                                                        gpointer         user_data)            : Run First
+ gpointer user_data) : Run First

The "session-image-removed" signal

void                user_function                      (EntangleSession *entanglesession,
                                                         EntangleImage   *arg1,
-                                                        gpointer         user_data)            : Run First
+ gpointer user_data) : Run First
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleSessionBrowser.html entangle-0.5.2/docs/reference/html/EntangleSessionBrowser.html --- entangle-0.5.1/docs/reference/html/EntangleSessionBrowser.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleSessionBrowser.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleSessionBrowser - + - + @@ -47,35 +47,35 @@

Synopsis

struct              EntangleSessionBrowser;
 struct              EntangleSessionBrowserClass;
-GList *             entangle_session_browser_earlier_images
+EntangleSessionBrowser * entangle_session_browser_new   (void);
+EntangleImage *     entangle_session_browser_selected_image
+                                                        (EntangleSessionBrowser *browser);
+GList *             entangle_session_browser_earlier_images
                                                         (EntangleSessionBrowser *browser,
-                                                         gsize count);
-EntangleImage *     entangle_session_browser_get_image_at_coords
+                                                         gsize count);
+void                entangle_session_browser_set_thumbnail_loader
                                                         (EntangleSessionBrowser *browser,
-                                                         gint x,
-                                                         gint y);
-EntangleSession *   entangle_session_browser_get_session
-                                                        (EntangleSessionBrowser *browser);
+                                                         EntangleThumbnailLoader *loader);
 EntangleThumbnailLoader * entangle_session_browser_get_thumbnail_loader
                                                         (EntangleSessionBrowser *browser);
-EntangleSessionBrowser * entangle_session_browser_new   (void);
-EntangleImage *     entangle_session_browser_selected_image
-                                                        (EntangleSessionBrowser *browser);
 void                entangle_session_browser_set_session
                                                         (EntangleSessionBrowser *browser,
                                                          EntangleSession *session);
-void                entangle_session_browser_set_thumbnail_loader
+EntangleSession *   entangle_session_browser_get_session
+                                                        (EntangleSessionBrowser *browser);
+EntangleImage *     entangle_session_browser_get_image_at_coords
                                                         (EntangleSessionBrowser *browser,
-                                                         EntangleThumbnailLoader *loader);
+                                                         gint x,
+                                                         gint y);

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
-         +----GtkWidget
-               +----GtkDrawingArea
+  GObject
+   +----GInitiallyUnowned
+         +----GtkWidget
+               +----GtkDrawingArea
                      +----EntangleSessionBrowser
@@ -83,7 +83,7 @@

Implemented Interfaces

EntangleSessionBrowser implements - AtkImplementorIface, GtkBuildable, GtkCellLayout and GtkScrollable.

+ AtkImplementorIface, GtkBuildable, GtkCellLayout and GtkScrollable.

Properties

@@ -95,7 +95,7 @@

Signals

-  "selection-changed"                              : Run First
+  "selection-changed"                              : Run First
@@ -119,40 +119,33 @@
-

entangle_session_browser_earlier_images ()

-
GList *             entangle_session_browser_earlier_images
-                                                        (EntangleSessionBrowser *browser,
-                                                         gsize count);
-
-
-
-

entangle_session_browser_get_image_at_coords ()

-
EntangleImage *     entangle_session_browser_get_image_at_coords
-                                                        (EntangleSessionBrowser *browser,
-                                                         gint x,
-                                                         gint y);
+

entangle_session_browser_new ()

+
EntangleSessionBrowser * entangle_session_browser_new   (void);
-

entangle_session_browser_get_session ()

-
EntangleSession *   entangle_session_browser_get_session
+
entangle_session_browser_selected_image ()

+
EntangleImage *     entangle_session_browser_selected_image
                                                         (EntangleSessionBrowser *browser);
-

entangle_session_browser_get_thumbnail_loader ()

-
EntangleThumbnailLoader * entangle_session_browser_get_thumbnail_loader
-                                                        (EntangleSessionBrowser *browser);
+

entangle_session_browser_earlier_images ()

+
GList *             entangle_session_browser_earlier_images
+                                                        (EntangleSessionBrowser *browser,
+                                                         gsize count);
-

entangle_session_browser_new ()

-
EntangleSessionBrowser * entangle_session_browser_new   (void);
+

entangle_session_browser_set_thumbnail_loader ()

+
void                entangle_session_browser_set_thumbnail_loader
+                                                        (EntangleSessionBrowser *browser,
+                                                         EntangleThumbnailLoader *loader);
-

entangle_session_browser_selected_image ()

-
EntangleImage *     entangle_session_browser_selected_image
+
entangle_session_browser_get_thumbnail_loader ()

+
EntangleThumbnailLoader * entangle_session_browser_get_thumbnail_loader
                                                         (EntangleSessionBrowser *browser);
@@ -164,10 +157,17 @@
-

entangle_session_browser_set_thumbnail_loader ()

-
void                entangle_session_browser_set_thumbnail_loader
+
entangle_session_browser_get_session ()

+
EntangleSession *   entangle_session_browser_get_session
+                                                        (EntangleSessionBrowser *browser);

+
+
+
+

entangle_session_browser_get_image_at_coords ()

+
EntangleImage *     entangle_session_browser_get_image_at_coords
                                                         (EntangleSessionBrowser *browser,
-                                                         EntangleThumbnailLoader *loader);
+ gint x, + gint y);
@@ -189,12 +189,12 @@

The "selection-changed" signal

void                user_function                      (EntangleSessionBrowser *entanglesessionbrowser,
-                                                        gpointer                user_data)                   : Run First
+ gpointer user_data) : Run First
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/EntangleThumbnailLoader.html entangle-0.5.2/docs/reference/html/EntangleThumbnailLoader.html --- entangle-0.5.1/docs/reference/html/EntangleThumbnailLoader.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/EntangleThumbnailLoader.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ EntangleThumbnailLoader - + - + @@ -50,7 +50,7 @@

Object Hierarchy

-  GObject
+  GObject
    +----EntanglePixbufLoader
          +----EntangleThumbnailLoader
@@ -58,8 +58,8 @@

Properties

-  "height"                   gint                  : Read / Write / Construct Only
-  "width"                    gint                  : Read / Write / Construct Only
+  "height"                   gint                  : Read / Write / Construct Only
+  "width"                    gint                  : Read / Write / Construct Only
@@ -90,7 +90,7 @@

Property Details

The "height" property

-
  "height"                   gint                  : Read / Write / Construct Only
+
  "height"                   gint                  : Read / Write / Construct Only

Maximum thumbnail height.

Allowed values: [1,400]

Default value: 128

@@ -98,7 +98,7 @@

The "width" property

-
  "width"                    gint                  : Read / Write / Construct Only
+
  "width"                    gint                  : Read / Write / Construct Only

Maximum thumbnail width.

Allowed values: [1,400]

Default value: 128

@@ -107,6 +107,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19
\ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/annotation-glossary.html entangle-0.5.2/docs/reference/html/annotation-glossary.html --- entangle-0.5.1/docs/reference/html/annotation-glossary.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/annotation-glossary.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,11 +3,11 @@ Annotation Glossary - + - + @@ -25,12 +25,11 @@

Annotation Glossary

T

-
-transfer container
-

Free data container after the code is done.

+
transfer container
+

Free data container after the code is done.

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19
\ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/api-index-full.html entangle-0.5.2/docs/reference/html/api-index-full.html --- entangle-0.5.1/docs/reference/html/api-index-full.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/api-index-full.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ API Index - + - + @@ -702,87 +702,87 @@
-EntangleColourProfile, struct in EntangleColourProfileTransform +EntangleColourProfile, struct in EntangleColourProfile
-EntangleColourProfile:data, object property in EntangleColourProfileTransform +EntangleColourProfile:data, object property in EntangleColourProfile
-EntangleColourProfile:filename, object property in EntangleColourProfileTransform +EntangleColourProfile:filename, object property in EntangleColourProfile
-EntangleColourProfileClass, struct in EntangleColourProfileTransform +EntangleColourProfileClass, struct in EntangleColourProfile
-EntangleColourProfileIntent, enum in EntangleColourProfileTransform +EntangleColourProfileIntent, enum in EntangleColourProfile
-EntangleColourProfileTransform, struct in EntangleColourProfileTransform +EntangleColourProfileTransform, struct in EntangleColourProfile
-EntangleColourProfileTransform:dst-profile, object property in EntangleColourProfileTransform +EntangleColourProfileTransform:dst-profile, object property in EntangleColourProfile
-EntangleColourProfileTransform:rendering-intent, object property in EntangleColourProfileTransform +EntangleColourProfileTransform:rendering-intent, object property in EntangleColourProfile
-EntangleColourProfileTransform:src-profile, object property in EntangleColourProfileTransform +EntangleColourProfileTransform:src-profile, object property in EntangleColourProfile
-EntangleColourProfileTransformClass, struct in EntangleColourProfileTransform +EntangleColourProfileTransformClass, struct in EntangleColourProfile
-entangle_colour_profile_copyright, function in EntangleColourProfileTransform +entangle_colour_profile_copyright, function in EntangleColourProfile
-entangle_colour_profile_filename, function in EntangleColourProfileTransform +entangle_colour_profile_filename, function in EntangleColourProfile
-entangle_colour_profile_manufacturer, function in EntangleColourProfileTransform +entangle_colour_profile_manufacturer, function in EntangleColourProfile
-entangle_colour_profile_model, function in EntangleColourProfileTransform +entangle_colour_profile_model, function in EntangleColourProfile
-entangle_colour_profile_new_data, function in EntangleColourProfileTransform +entangle_colour_profile_new_data, function in EntangleColourProfile
-entangle_colour_profile_new_file, function in EntangleColourProfileTransform +entangle_colour_profile_new_file, function in EntangleColourProfile
-entangle_colour_profile_product_desc, function in EntangleColourProfileTransform +entangle_colour_profile_product_desc, function in EntangleColourProfile
-entangle_colour_profile_product_info, function in EntangleColourProfileTransform +entangle_colour_profile_product_info, function in EntangleColourProfile
-entangle_colour_profile_product_name, function in EntangleColourProfileTransform +entangle_colour_profile_product_name, function in EntangleColourProfile
-entangle_colour_profile_transform_apply, function in EntangleColourProfileTransform +entangle_colour_profile_transform_apply, function in EntangleColourProfile
-entangle_colour_profile_transform_new, function in EntangleColourProfileTransform +entangle_colour_profile_transform_new, function in EntangleColourProfile
@@ -1265,6 +1265,10 @@
+entangle_image_display_get_loaded, function in EntangleImageDisplay +
+
+
entangle_image_display_get_mask_enabled, function in EntangleImageDisplay
@@ -1337,6 +1341,10 @@
+entangle_image_histogram_get_histogram_linear, function in EntangleImageHistogram +
+
+
entangle_image_histogram_get_image, function in EntangleImageHistogram
@@ -1345,6 +1353,10 @@
+entangle_image_histogram_set_histogram_linear, function in EntangleImageHistogram +
+
+
entangle_image_histogram_set_image, function in EntangleImageHistogram
@@ -1590,6 +1602,10 @@
+EntanglePreferences:interface-histogram-linear, object property in EntanglePreferences +
+
+
EntanglePreferences:interface-screen-blank, object property in EntanglePreferences
@@ -1766,6 +1782,10 @@
+entangle_preferences_interface_get_histogram_linear, function in EntanglePreferences +
+
+
entangle_preferences_interface_get_plugins, function in EntanglePreferences
@@ -1782,6 +1802,10 @@
+entangle_preferences_interface_set_histogram_linear, function in EntanglePreferences +
+
+
entangle_preferences_interface_set_screen_blank, function in EntanglePreferences
@@ -2059,6 +2083,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/ch01.html entangle-0.5.2/docs/reference/html/ch01.html --- entangle-0.5.1/docs/reference/html/ch01.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/ch01.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ Entangle Backend - + - + @@ -21,8 +21,8 @@

-Entangle Backend

-
+Entangle Backend
+
EntangleCamera
@@ -33,7 +33,7 @@ EntangleCameraList
-EntangleColourProfileTransform +EntangleColourProfile
EntangleControl @@ -93,6 +93,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/ch02.html entangle-0.5.2/docs/reference/html/ch02.html --- entangle-0.5.1/docs/reference/html/ch02.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/ch02.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ Entangle Frontend - + - + @@ -21,8 +21,8 @@

-Entangle Frontend

-
+Entangle Frontend
+
EntangleApplication
@@ -69,6 +69,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/index.html entangle-0.5.2/docs/reference/html/index.html --- entangle-0.5.1/docs/reference/html/index.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/index.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,10 +3,10 @@ Entangle Reference Manual - + - + @@ -22,7 +22,7 @@
-
+
Entangle Backend
@@ -35,7 +35,7 @@ EntangleCameraList
-EntangleColourProfileTransform +EntangleColourProfile
EntangleControl @@ -144,6 +144,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19
\ No newline at end of file diff -Nru entangle-0.5.1/docs/reference/html/index.sgml entangle-0.5.2/docs/reference/html/index.sgml --- entangle-0.5.1/docs/reference/html/index.sgml 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/index.sgml 2013-08-17 18:28:18.000000000 +0000 @@ -8,59 +8,59 @@ - - - - - - + + + - - - + + + + + + + + + + - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + - - - + + + + @@ -91,14 +91,14 @@ - + - - + + @@ -114,50 +114,54 @@ - + + - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -166,14 +170,14 @@ - + - - - - + + + + @@ -198,10 +202,10 @@ + - @@ -222,11 +226,11 @@ + - @@ -235,10 +239,10 @@ - + + - @@ -274,8 +278,8 @@ - + @@ -288,16 +292,16 @@ - - + + - + + - - - + + @@ -310,10 +314,10 @@ - - + + @@ -321,8 +325,11 @@ - + + + + @@ -333,16 +340,16 @@ - - - - + + + + + - - + @@ -360,48 +367,50 @@ - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + + - - - - - - - - - + + + + + + - - - + + + - - - - - - - - + + @@ -421,6 +430,7 @@ + @@ -428,8 +438,8 @@ - + @@ -439,15 +449,15 @@ - + - - - - + + + + @@ -470,11 +480,11 @@ - - + + @@ -484,10 +494,10 @@ + - - + @@ -502,14 +512,17 @@ - - + + + + + - - - + + + @@ -525,17 +538,17 @@ - - - + + - + - - + + + @@ -550,10 +563,10 @@ - - + + @@ -571,12 +584,12 @@ - + + - - + @@ -590,10 +603,10 @@ - - + + @@ -609,10 +622,10 @@ - - + + @@ -623,26 +636,33 @@ - - - - - + + + - - + + + - - + + + + + + + + + + + + + + - - - - - + @@ -661,9 +681,11 @@ - + + + @@ -675,13 +697,13 @@ - - - - + + + + @@ -695,9 +717,9 @@ - + @@ -708,10 +730,10 @@ - - + + @@ -724,14 +746,14 @@ - - - - - + + + + + diff -Nru entangle-0.5.1/docs/reference/html/object-tree.html entangle-0.5.2/docs/reference/html/object-tree.html --- entangle-0.5.1/docs/reference/html/object-tree.html 2013-03-12 21:25:59.000000000 +0000 +++ entangle-0.5.2/docs/reference/html/object-tree.html 2013-08-17 18:28:18.000000000 +0000 @@ -3,12 +3,12 @@ Object Hierarchy - + - + @@ -23,9 +23,9 @@

Object Hierarchy

-    GObject
-        GApplication
-            GtkApplication
+    GObject
+        GApplication
+            GtkApplication
                 EntangleApplication
         EntangleCameraFile
         EntangleCamera
@@ -34,8 +34,8 @@
         EntangleCameraManager
         EntangleCameraPicker
         EntangleCameraSupport
-        EntangleColourProfile
-        EntangleColourProfileTransform
+        EntangleColourProfile
+        EntangleColourProfileTransform
         EntangleControl
             EntangleControlButton
             EntangleControlChoice
@@ -44,16 +44,16 @@
             EntangleControlRange
             EntangleControlText
             EntangleControlToggle
-        GInitiallyUnowned
-            GtkWidget
-                GtkContainer
-                    GtkBox
-                        GtkVBox
+        GInitiallyUnowned
+            GtkWidget
+                GtkContainer
+                    GtkBox
+                        GtkVBox
                             EntangleControlPanel
-                    GtkBin
-                        GtkEventBox
+                    GtkBin
+                        GtkEventBox
                             EntangleImageStatusbar
-                GtkDrawingArea
+                GtkDrawingArea
                     EntangleImageDisplay
                     EntangleImageHistogram
                     EntangleSessionBrowser
@@ -69,12 +69,12 @@
         EntangleSession
     GEnum
         EntangleCameraInfoData
-        EntangleColourProfileIntent
+        EntangleColourProfileIntent
         EntangleImageDisplayGrid
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru entangle-0.5.1/entangle.spec entangle-0.5.2/entangle.spec --- entangle-0.5.1/entangle.spec 2013-03-12 21:24:45.000000000 +0000 +++ entangle-0.5.2/entangle.spec 2013-08-17 18:28:02.000000000 +0000 @@ -2,7 +2,7 @@ Summary: Tethered shooting & control of digital cameras Name: entangle -Version: 0.5.1 +Version: 0.5.2 Release: 1%{?dist}%{?extra_release} License: GPLv3+ Group: Applications/Multimedia diff -Nru entangle-0.5.1/gtk-doc.make entangle-0.5.2/gtk-doc.make --- entangle-0.5.1/gtk-doc.make 2011-08-16 16:46:24.000000000 +0000 +++ entangle-0.5.2/gtk-doc.make 2013-05-26 12:37:34.000000000 +0000 @@ -74,31 +74,40 @@ #### setup #### +GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V)) +GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP_0=@echo " DOC Preparing build"; + setup-build.stamp: - -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - echo ' DOC Preparing build'; \ + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ fi - @touch setup-build.stamp + $(AM_V_at)touch setup-build.stamp #### scan #### +GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V)) +GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN_0=@echo " DOC Scanning header files"; + +GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V)) +GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT_0=@echo " DOC Introspecting gobjects"; + scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo ' DOC Scanning header files' - @_source_dir='' ; \ + $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - echo " DOC Introspecting gobjects"; \ + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ @@ -113,32 +122,41 @@ test -f $$i || touch $$i ; \ done \ fi - @touch scan-build.stamp + $(AM_V_at)touch scan-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true #### xml #### +GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V)) +GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML_0=@echo " DOC Building XML"; + sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) - @echo ' DOC Building XML' - @_source_dir='' ; \ + $(GTK_DOC_V_XML)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) - @touch sgml-build.stamp + $(AM_V_at)touch sgml-build.stamp sgml.stamp: sgml-build.stamp @true #### html #### +GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V)) +GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML_0=@echo " DOC Building HTML"; + +GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V)) +GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references"; + html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building HTML' - @rm -rf html - @mkdir html - @mkhtml_options=""; \ + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -159,16 +177,18 @@ cp $(abs_builddir)/$$file $(abs_builddir)/html; \ fi; \ done; - @echo ' DOC Fixing cross-references' - @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - @touch html-build.stamp + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp #### pdf #### +GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V)) +GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF_0=@echo " DOC Building PDF"; + pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building PDF' - @rm -f $(DOC_MODULE).pdf - @mkpdf_options=""; \ + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -185,7 +205,7 @@ done; \ fi; \ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) - @touch pdf-build.stamp + $(AM_V_at)touch pdf-build.stamp ############## @@ -200,7 +220,7 @@ rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ fi -maintainer-clean-local: clean +maintainer-clean-local: @rm -rf xml html install-data-local: @@ -237,7 +257,7 @@ # Require gtk-doc when making dist # if ENABLE_GTK_DOC -dist-check-gtkdoc: +dist-check-gtkdoc: docs else dist-check-gtkdoc: @echo "*** gtk-doc must be installed and enabled in order to make dist" diff -Nru entangle-0.5.1/m4/entangle-compile-warnings.m4 entangle-0.5.2/m4/entangle-compile-warnings.m4 --- entangle-0.5.1/m4/entangle-compile-warnings.m4 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/m4/entangle-compile-warnings.m4 2013-08-17 18:27:47.000000000 +0000 @@ -98,7 +98,7 @@ gl_WARN_ADD([-Wno-suggest-attribute=pure]) gl_WARN_ADD([-Wno-suggest-attribute=const]) - if test "$enable_werror" = "yes" + if test "$set_werror" = "yes" then gl_WARN_ADD([-Werror]) fi diff -Nru entangle-0.5.1/m4/gtk-doc.m4 entangle-0.5.2/m4/gtk-doc.m4 --- entangle-0.5.1/m4/gtk-doc.m4 2011-09-08 16:24:18.000000000 +0000 +++ entangle-0.5.2/m4/gtk-doc.m4 2012-12-14 16:23:01.000000000 +0000 @@ -37,7 +37,7 @@ dnl don't check for glib if we build glib if test "x$PACKAGE_NAME" != "xglib"; then dnl don't fail if someone does not have glib - PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,) + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) fi fi @@ -58,6 +58,10 @@ enable_gtk_doc_pdf=no fi + if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 + fi + AC_SUBST([AM_DEFAULT_VERBOSITY]) AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) diff -Nru entangle-0.5.1/missing entangle-0.5.2/missing --- entangle-0.5.1/missing 2013-03-12 21:24:37.000000000 +0000 +++ entangle-0.5.2/missing 2013-08-17 18:27:59.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 entangle-0.5.1/po/LINGUAS entangle-0.5.2/po/LINGUAS --- entangle-0.5.1/po/LINGUAS 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/LINGUAS 2013-08-17 18:27:47.000000000 +0000 @@ -4,6 +4,7 @@ bg bn_IN bn +bo br ca cs @@ -27,6 +28,7 @@ ja ka kk +kn ko ks lv @@ -42,10 +44,12 @@ ru si sk +sl sq sr sv ta +te tr uk vi diff -Nru entangle-0.5.1/po/ar.po entangle-0.5.2/po/ar.po --- entangle-0.5.1/po/ar.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/ar.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Arabic \n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/as.po entangle-0.5.2/po/as.po --- entangle-0.5.1/po/as.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/as.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Assamese (http://www.transifex.com/projects/p/fedora/language/as/)\n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/ast.po entangle-0.5.2/po/ast.po --- entangle-0.5.1/po/ast.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/ast.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Asturian (http://www.transifex.com/projects/p/fedora/language/ast/)\n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/bg.po entangle-0.5.2/po/bg.po --- entangle-0.5.1/po/bg.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/bg.po 2013-08-17 18:27:47.000000000 +0000 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Valentin Laskov , 2012. +# Valentin Laskov , 2012 msgid "" msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Bulgarian \n" "MIME-Version: 1.0\n" @@ -19,193 +19,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "Не мога да инициализирам способностите на gphoto2" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "Не мога да заредя способностите на gphoto2" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "Не мога да инициализирам портовете на gphoto2" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "Не мога да заредя портовете на gphoto2" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "Не мога да инициализирам камерата" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "Не мога да правя снимка докато не съм свързан" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "Невъзможно е правенето на снимки: %s" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "Не мога да покажа предв. преглед докато не съм свързан" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "Невъзможен предварителен преглед: %s" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "Невъзможно вземането данните на файла: %s" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "Невъзможно вземането името на файла: %s" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "Не мога да сваля файл докато не съм свързан" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "Невъзможно да взема файла на камерата: %s" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "Не мога да изтрия файл докато не съм свързан" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "Невъзможно изтриване на файла: %s" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "Не мога да очаквам събития докато не съм свързан" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "Невъзможно очакването на събития: %s" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "Невъзможно да се извлече типа на джаджата" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "Невъзможно да се извлече името на джаджата" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "Не мога да заредя управлението, камерата не е свързана" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "Не мога да извлека конфигурацията за управление на камерата" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "Невъзможно да запиша управлението, камерата не е свързана" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "Невъзможно да запиша управлението, камерата не може да се конфигурира" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "Невъзможно да запиша конфигурацията за управлението на камерата: %s %d" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "Управлението не е налично, докато камерата е изключена" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "Управление не е налично за тази камера" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "Не мога да заредя файла с дефиниции на потребителския интерфейс: %s" @@ -235,74 +235,74 @@ msgid "label" msgstr "етикет" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "Камерата не поддържа снимане на изображения" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "Тази камера не поддържа предв. преглед на изображения" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "Действие: %s" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "Entangle: Действието не успя" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "Зареждането на управлението на камерата не успя" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "Entangle: Зареждането на управлението на камерата не успя" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "Монитор" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "Изтрий" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "Сваляне" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "Снимане" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "Преглед" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "Управление на камерата - Entangle" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "Не мога да се свържа към камерата: %s" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -311,72 +311,72 @@ " - in sleep mode to save battery power\n" msgstr "Проверете дали камерата не е\n\n - отворена от друго фото приложение\n - монтирана като файлова система на десктопа\n - в спящ режим за пестене на енергия\n" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "Отказ" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "Опит отново" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "Камерата се ползва" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "Не мога да отворя камерата, понеже в момента е монтирана като файлова система. Искате ли да я демонтирам сега?" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "Не" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "Да" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "Свързването към камера не успя" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "Entangle: Свързването към камера не успя" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "Управление на камера %s - Entangle" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "Изберете папка" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "Изберете приложение..." @@ -573,19 +573,19 @@ msgid "Entangle: Camera control update failed" msgstr "Entangle: Обновяването на управлението на камерата не успя" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "Вкл." -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "Изкл." -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -616,159 +616,159 @@ msgid "Tethered Camera Control & Capture" msgstr "Свързани контрол на камерата и снимане" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "Интерфейс" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "Управление на цветовете" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "Плъгини" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "ICC профили (*.icc, *.icm)" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "Всички файлове (*.*)" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "1:1 - Квадрат / MF 6x6" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "1.15:1 - Movietone" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "1.37:1 - 35mm филм" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "1.44:1 - IMAX" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "1.50:1 (3:2, 15:10)- 35mm SLR" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "1.6:1 (8:5, 16:10) - Широк екран" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "1.66:1 (5:3, 15:9) - Super 16mm" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "1.75:1 (7:4) - Широк екран" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "1.77:1 (16:9) - APS-H / HDTV / Широк екран" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "1.85:1 - 35mm Широк екран" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "2.00:1 - SuperScope" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "2.10:1 (21:10) - Planned HDTV" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "2.20:1 (11:5, 22:10) - 70mm филм" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "2.35:1 - CinemaScope" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "2.37:1 (64:27)- HDTV cinema" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "2.39:1 (12:5)- Panavision" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "2.55:1 (23:9)- CinemaScope 55" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "2.59:1 (13:5)- Cinerama" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "2.66:1 (8:3, 24:9)- Super 16mm" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "2.76:1 (11:4) - Ultra Panavision" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "2.93:1 - MGM Camera 65" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "3:1 APS Panorama" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "4.00:1 - Polyvision" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "12.00:1 - Circle-Vision 360" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "Нищо" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "Златно сечение" @@ -859,38 +859,42 @@ msgid "Blank screen when capturing images" msgstr "Празен екран при заснемане на изображение" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 +msgid "Image Viewer" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:27 msgid "Apply mask to alter aspect ratio" msgstr "Прилагане на маска за промяна на съотношението" -#: ../src/frontend/entangle-preferences.xml.h:27 +#: ../src/frontend/entangle-preferences.xml.h:28 msgid "Aspect ratio:" msgstr "Съотношение:" -#: ../src/frontend/entangle-preferences.xml.h:28 +#: ../src/frontend/entangle-preferences.xml.h:29 msgid "Mask opacity:" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:29 +#: ../src/frontend/entangle-preferences.xml.h:30 msgid "Display focus point during preview" msgstr "Показва точката на фокус в предв. преглед" -#: ../src/frontend/entangle-preferences.xml.h:30 +#: ../src/frontend/entangle-preferences.xml.h:31 msgid "Grid lines:" msgstr "Мрежа от линии:" -#: ../src/frontend/entangle-preferences.xml.h:31 +#: ../src/frontend/entangle-preferences.xml.h:32 msgid "Use embedded preview from raw files" msgstr "Ползвай вградения предв. преглед от raw файлове" -#: ../src/frontend/entangle-preferences.xml.h:32 +#: ../src/frontend/entangle-preferences.xml.h:33 msgid "Overlay earlier images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:33 +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/bn.po entangle-0.5.2/po/bn.po --- entangle-0.5.1/po/bn.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/bn.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Bengali \n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/bn_IN.po entangle-0.5.2/po/bn_IN.po --- entangle-0.5.1/po/bn_IN.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/bn_IN.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Bengali (India) \n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/bo.po entangle-0.5.2/po/bo.po --- entangle-0.5.1/po/bo.po 1970-01-01 00:00:00.000000000 +0000 +++ entangle-0.5.2/po/bo.po 2013-08-17 18:27:47.000000000 +0000 @@ -0,0 +1,899 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: Entangle\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" +"Last-Translator: Daniel Berrange \n" +"Language-Team: Tibetan \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: bo\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../src/backend/entangle-camera-list.c:218 +#: ../src/backend/entangle-camera.c:746 +#, c-format +msgid "Cannot initialize gphoto2 abilities" +msgstr "" + +#: ../src/backend/entangle-camera-list.c:221 +#: ../src/backend/entangle-camera.c:752 +#, c-format +msgid "Cannot load gphoto2 abilities" +msgstr "" + +#: ../src/backend/entangle-camera-list.c:224 +#: ../src/backend/entangle-camera.c:758 +#, c-format +msgid "Cannot initialize gphoto2 ports" +msgstr "" + +#: ../src/backend/entangle-camera-list.c:227 +#: ../src/backend/entangle-camera.c:764 +#, c-format +msgid "Cannot load gphoto2 ports" +msgstr "" + +#: ../src/backend/entangle-camera.c:795 +#, c-format +msgid "Unable to initialize camera" +msgstr "" + +#: ../src/backend/entangle-camera.c:1054 +msgid "Cannot capture image while not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:1067 +#, c-format +msgid "Unable to capture image: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1153 +msgid "Cannot preview image while not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:1168 +#, c-format +msgid "Unable to capture preview: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 +#, c-format +msgid "Unable to get file data: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1179 +#, c-format +msgid "Unable to get filename: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1275 +msgid "Cannot download file while not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:1297 +#, c-format +msgid "Unable to get camera file: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1392 +msgid "Cannot delete file while not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:1409 +#, c-format +msgid "Unable to delete file: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1491 +msgid "Cannot wait for events while not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:1517 +#, c-format +msgid "Unable to wait for events: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 +#, c-format +msgid "Unable to fetch widget type" +msgstr "" + +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 +#, c-format +msgid "Unable to fetch widget name" +msgstr "" + +#: ../src/backend/entangle-camera.c:2063 +#, c-format +msgid "Unable to load controls, camera is not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:2071 +#, c-format +msgid "Unable to fetch camera control configuration" +msgstr "" + +#: ../src/backend/entangle-camera.c:2158 +#, c-format +msgid "Unable to save controls, camera is not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:2164 +#, c-format +msgid "Unable to save controls, camera is not configurable" +msgstr "" + +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 +#, c-format +msgid "Unable to save camera control configuration: %s %d" +msgstr "" + +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 +#, c-format +msgid "Controls not available when camera is disconnected" +msgstr "" + +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 +#, c-format +msgid "Controls not available for this camera" +msgstr "" + +#: ../src/backend/entangle-camera.c:2304 +#, c-format +msgid "Viewfinder control not available with this camera" +msgstr "" + +#: ../src/backend/entangle-camera.c:2317 +#, c-format +msgid "Viewfinder control was not a toggle widget" +msgstr "" + +#: ../src/backend/entangle-camera.c:2324 +#, c-format +msgid "Failed to set viewfinder state: %s %d" +msgstr "" + +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 +#, c-format +msgid "Failed to set manual focus state: %s %d" +msgstr "" + +#: ../src/backend/entangle-camera.c:2442 +#, c-format +msgid "Autofocus control not available with this camera" +msgstr "" + +#: ../src/backend/entangle-camera.c:2455 +#, c-format +msgid "Autofocus control was not a toggle widget" +msgstr "" + +#: ../src/backend/entangle-camera.c:2462 +#, c-format +msgid "Failed to set autofocus state: %s %d" +msgstr "" + +#: ../src/backend/entangle-camera.c:2568 +#, c-format +msgid "Manual focus control not available with this camera" +msgstr "" + +#: ../src/backend/entangle-camera.c:2581 +#, c-format +msgid "Manual focus control was not a range widget" +msgstr "" + +#: ../src/frontend/entangle-camera-info.c:236 +#: ../src/frontend/entangle-camera-manager.c:3023 +#: ../src/frontend/entangle-camera-picker.c:521 +#: ../src/frontend/entangle-camera-support.c:192 +#: ../src/frontend/entangle-help-about.c:114 +#: ../src/frontend/entangle-image-popup.c:242 +#: ../src/frontend/entangle-preferences-display.c:888 +#, c-format +msgid "Could not load user interface definition file: %s" +msgstr "" + +#: ../src/frontend/entangle-camera-info.c:299 +msgid "Unknown information" +msgstr "" + +#: ../src/frontend/entangle-camera-info.c:346 +#, c-format +msgid "%s Camera Info - Entangle" +msgstr "" + +#: ../src/frontend/entangle-camera-info.c:349 +msgid "Camera Info - Entangle" +msgstr "" + +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * tab-width: 8 +#. * End: +#. +#: ../src/frontend/entangle-camera-info.xml.h:1 +#: ../src/frontend/entangle-camera-support.xml.h:1 +msgid "label" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:537 +msgid "This camera does not support image capture" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:542 +msgid "This camera does not support image preview" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:683 +#, c-format +msgid "Operation: %s" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:685 +msgid "Entangle: Operation failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 +msgid "Camera load controls failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 +msgid "Entangle: Camera load controls failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:756 +msgid "Monitor" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 +msgid "Delete" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:928 +msgid "Download" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 +#: ../src/frontend/entangle-camera-manager.xml.h:22 +#: ../src/frontend/entangle-camera-picker.c:533 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 +#: ../src/frontend/entangle-preferences.xml.h:10 +msgid "Capture" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1060 +#: ../src/frontend/entangle-camera-manager.xml.h:24 +msgid "Preview" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1245 +msgid "Camera Manager - Entangle" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 +#, c-format +msgid "Unable to connect to camera: %s" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 +msgid "" +"Check that the camera is not\n" +"\n" +" - opened by another photo application\n" +" - mounted as a filesystem on the desktop\n" +" - in sleep mode to save battery power\n" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 +#: ../src/frontend/entangle-camera-manager.xml.h:27 +msgid "Cancel" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 +msgid "Retry" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1373 +msgid "Camera is in use" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1377 +msgid "" +"The camera cannot be opened because it is currently mounted as a filesystem." +" Do you wish to umount it now ?" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1381 +#: ../src/frontend/entangle-camera-picker.c:125 +msgid "No" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1382 +#: ../src/frontend/entangle-camera-picker.c:125 +msgid "Yes" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1417 +msgid "Camera connect failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1419 +msgid "Entangle: Camera connect failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1455 +#, c-format +msgid "%s Camera Manager - Entangle" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1808 +#: ../src/frontend/entangle-camera-manager.xml.h:19 +msgid "Select a folder" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:2087 +msgid "Autofocus failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:2089 +msgid "Entangle: Camera autofocus failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:2118 +msgid "Manual focus failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:2120 +msgid "Entangle: Camera manual focus failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:2849 +msgid "Select application..." +msgstr "" + +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * tab-width: 8 +#. * End: +#. +#: ../src/frontend/entangle-camera-manager.xml.h:1 +msgid "Entangle" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:2 +msgid "_File" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:3 +msgid "Select session" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:4 +msgid "Connect camera" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:5 +msgid "_Edit" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:6 +msgid "_View" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:7 +msgid "Settings" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:8 +msgid "Fullscreen" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:9 +msgid "Presentation" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:10 +msgid "Present on" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:11 +msgid "Windows" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:12 +msgid "New window" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:13 +msgid "Synchronize capture" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:14 +msgid "_Help" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:15 +msgid "Camera" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:16 +msgid "Driver" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:17 +msgid "Manual" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:18 +msgid "Supported Cameras" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:20 +msgid "View the full list of camera settings" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:21 +msgid "Capture an image" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:23 +msgid "Continuous capture preview" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:25 +msgid "" +"Attempt to cancel the currently\n" +"executing camera operation" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:28 +msgid "" +"Shrink the display of the image\n" +"by one factor" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:30 +msgid "Zoom Out" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:31 +msgid "" +"Enlarge the display of the image\n" +"by one factor" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:33 +msgid "Zoom In" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:34 +msgid "" +"Resize the image to automatically\n" +"fit the available window real estate" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:36 +msgid "Best Fit" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:37 +msgid "" +"Display the image with its\n" +"native pixel size" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:39 +msgid "Normal" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:40 +msgid "Switch to fullscreen display mode" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:41 +msgid "Full Screen" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:42 +msgid "Open with" +msgstr "" + +#: ../src/frontend/entangle-camera-picker.c:531 +msgid "Model" +msgstr "" + +#: ../src/frontend/entangle-camera-picker.c:532 +msgid "Port" +msgstr "" + +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * tab-width: 8 +#. * End: +#. +#: ../src/frontend/entangle-camera-picker.xml.h:1 +msgid "Select camera - Entangle" +msgstr "" + +#: ../src/frontend/entangle-camera-picker.xml.h:2 +msgid "Select a camera to connect to:" +msgstr "" + +#: ../src/frontend/entangle-camera-picker.xml.h:3 +msgid "" +"No cameras were detected, check that\n" +"\n" +" - the cables are connected\n" +" - the camera is turned on\n" +" - the camera is in the correct mode\n" +" - the camera is a supported model\n" +"\n" +"USB cameras are automatically detected\n" +"when plugged in, for others try a refresh" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:79 +msgid "Camera control update failed" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:81 +msgid "Entangle: Camera control update failed" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:232 +msgid "On" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:232 +msgid "Off" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:559 +msgid "No camera connected" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:568 +msgid "No controls available" +msgstr "" + +#: ../src/frontend/entangle-dpms.c:57 +msgid "Screen blanking is not available on this display" +msgstr "" + +#: ../src/frontend/entangle-dpms.c:69 +msgid "Screen blanking is not implemented on this platform" +msgstr "" + +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * tab-width: 8 +#. * End: +#. +#: ../src/frontend/entangle-help-about.xml.h:1 +msgid "About - Entangle" +msgstr "" + +#: ../src/frontend/entangle-help-about.xml.h:2 +msgid "Copyright (C) 2009-2012 Daniel P. Berrange" +msgstr "" + +#: ../src/frontend/entangle-help-about.xml.h:3 +msgid "Tethered Camera Control & Capture" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 +msgid "Interface" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 +msgid "Image Viewer" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 +#: ../src/frontend/entangle-preferences.xml.h:18 +msgid "Color Management" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 +#: ../src/frontend/entangle-preferences.xml.h:20 +msgid "Plugins" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1030 +msgid "ICC profiles (*.icc, *.icm)" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1035 +msgid "All files (*.*)" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1061 +msgid "1:1 - Square / MF 6x6" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1066 +msgid "1.15:1 - Movietone" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1071 +msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1076 +msgid "1.37:1 - 35mm movie" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1081 +msgid "1.44:1 - IMAX" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1086 +msgid "1.50:1 (3:2, 15:10)- 35mm SLR" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1091 +msgid "1.6:1 (8:5, 16:10) - Widescreen" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1096 +msgid "1.66:1 (5:3, 15:9) - Super 16mm" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1101 +msgid "1.75:1 (7:4) - Widescreen" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1106 +msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1111 +msgid "1.85:1 - 35mm Widescreen" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1116 +msgid "2.00:1 - SuperScope" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1121 +msgid "2.10:1 (21:10) - Planned HDTV" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1126 +msgid "2.20:1 (11:5, 22:10) - 70mm movie" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1131 +msgid "2.35:1 - CinemaScope" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1136 +msgid "2.37:1 (64:27)- HDTV cinema" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1141 +msgid "2.39:1 (12:5)- Panavision" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1146 +msgid "2.55:1 (23:9)- CinemaScope 55" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1151 +msgid "2.59:1 (13:5)- Cinerama" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1156 +msgid "2.66:1 (8:3, 24:9)- Super 16mm" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1161 +msgid "2.76:1 (11:4) - Ultra Panavision" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1166 +msgid "2.93:1 - MGM Camera 65" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1171 +msgid "3:1 APS Panorama" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1176 +msgid "4.00:1 - Polyvision" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1181 +msgid "12.00:1 - Circle-Vision 360" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1199 +msgid "None" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1204 +msgid "Center lines" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1209 +msgid "Rule of 3rds" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1214 +msgid "Quarters" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1219 +msgid "Rule of 5ths" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1224 +msgid "Golden sections" +msgstr "" + +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * tab-width: 8 +#. * End: +#. +#: ../src/frontend/entangle-preferences.xml.h:1 +msgid "Perceptual" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:2 +msgid "Relative colourimetric" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:3 +msgid "Saturation" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:4 +msgid "Absolute colourimetric" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:5 +msgid "Entangle Preferences" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:6 +msgid "Capture" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:7 +msgid "Filename pattern:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:8 +msgid "Continue preview mode after capture" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:9 +msgid "Delete file from camera after downloading" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:11 +msgid "Colour management" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:12 +msgid "Mode of operation:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:13 +msgid "RGB profile:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:14 +msgid "Monitor profile:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:15 +msgid "Rendering intent:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:16 +msgid "Detect the system monitor profile" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:17 +msgid "Colour managed display" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:19 +msgid "Plugins" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:21 +msgid "Interface" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:22 +msgid "Automatically connect to cameras at startup" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:23 +msgid "Blank screen when capturing images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:26 +msgid "Image Viewer" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:27 +msgid "Apply mask to alter aspect ratio" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:28 +msgid "Aspect ratio:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:29 +msgid "Mask opacity:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:30 +msgid "Display focus point during preview" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:31 +msgid "Grid lines:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:32 +msgid "Use embedded preview from raw files" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 +msgid "Overlay layers:" +msgstr "" diff -Nru entangle-0.5.1/po/br.po entangle-0.5.2/po/br.po --- entangle-0.5.1/po/br.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/br.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Breton (http://www.transifex.com/projects/p/fedora/language/br/)\n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/ca.po entangle-0.5.2/po/ca.po --- entangle-0.5.1/po/ca.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/ca.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "etiqueta" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "Monitor" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "Suprimeix" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "Baixada" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "Captura" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "Previsualització" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "Cancel·la" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "Reintent" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "No" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "Sí" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "Activada" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "Desactivada" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "Interfície" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "Visualitzador d'imatges" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "Gestió del color" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "Connectors" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "Tots els fitxers (*.*)" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "Cap" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 +msgid "Apply mask to alter aspect ratio" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:28 msgid "Aspect ratio:" msgstr "Relació de l'aspecte:" -#: ../src/frontend/entangle-preferences.xml.h:28 +#: ../src/frontend/entangle-preferences.xml.h:29 msgid "Mask opacity:" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:29 +#: ../src/frontend/entangle-preferences.xml.h:30 msgid "Display focus point during preview" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:30 +#: ../src/frontend/entangle-preferences.xml.h:31 msgid "Grid lines:" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:31 +#: ../src/frontend/entangle-preferences.xml.h:32 msgid "Use embedded preview from raw files" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:32 +#: ../src/frontend/entangle-preferences.xml.h:33 msgid "Overlay earlier images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:33 +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/cs.po entangle-0.5.2/po/cs.po --- entangle-0.5.1/po/cs.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/cs.po 2013-08-17 18:27:47.000000000 +0000 @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# pavelb , 2013 msgid "" msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" -"Last-Translator: Daniel Berrange \n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-05-11 18:39+0000\n" +"Last-Translator: pavelb \n" "Language-Team: Czech (http://www.transifex.com/projects/p/fedora/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,209 +19,209 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" -msgstr "" +msgstr "Nezdařilo se inicializovat funkce gphoto2" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" -msgstr "" +msgstr "Nezdařilo se načíst funkce gphoto2" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" -msgstr "" +msgstr "Nezdařilo se inicializovat porty ghpoto2" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" -msgstr "" +msgstr "Nezdařilo se nahrát porty gphoto2" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" -msgstr "" +msgstr "Nezdařilo se inicializovat fotoaparát" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" -msgstr "" +msgstr "Když fotoaparát není připojen, není možné pořizovat snímky" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" -msgstr "" +msgstr "Nezdařilo se pořídit snímek: %s" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" -msgstr "" +msgstr "Když fotoaparát není připojen, nelze zobrazit náhled" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" -msgstr "" +msgstr "Nezdařilo se pořídit náhled: %s" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" -msgstr "" +msgstr "Nezdařilo se získat informace o souboru: %s" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" -msgstr "" +msgstr "Nezdařilo se získat název souboru: %s" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" -msgstr "" +msgstr "Když fotoaparát není připojen, nelze z něho stahovat obrázky" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" -msgstr "" +msgstr "Nezdařilo se získat soubor z fotoaparátu: %s" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" -msgstr "" +msgstr "Když fotoaparát není připojen, nelze z něho mazat obrázky" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" -msgstr "" +msgstr "Nezdařilo se smazat soubor: %s" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" -msgstr "" +msgstr "Když fotoaparát není připojen, nelze sledovat vyčkávat na událost" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" -msgstr "" +msgstr "Nezdařilo se vyčkávat na událost: %s" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" -msgstr "" +msgstr "Nezdařilo se získat typ prvku" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" -msgstr "" +msgstr "Nezdařilo se získat název prvku" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" -msgstr "" +msgstr "Nezdařilo se nahrát ovládací prvky – fotoaparát není připojen" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" -msgstr "" +msgstr "Nezdařilo se získat současné nastavení ovládacích prvků fotoaparátu" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" -msgstr "" +msgstr "Nezdařilo se uložit nastavení ovládacích prvků do fotoaparátu, protože není připojen" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" -msgstr "" +msgstr "Nezdařilo se uložit nastavení ovládacích prvků do fotoaparátu, protože tento fotoaparát to neumožňuje" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" -msgstr "" +msgstr "Nezdařilo se uložit nastavení ovládacích prvků: %s %d" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" -msgstr "" +msgstr "Když je fotoaparát odpojený, ovládací prvky nemohou být dostupné" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" -msgstr "" +msgstr "U tohoto fotoaparátu nejsou ovládací prvky dostupné" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" -msgstr "" +msgstr "Hledáček tohoto fotoaparátu nelze ovládat." -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" -msgstr "" +msgstr "Ovládání hledáčku nebylo přepínatelným prvkem." -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" -msgstr "" +msgstr "Nastavení hledáčku se nezdařilo: %s %d" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" -msgstr "" +msgstr "Nastavení ručního ostření se nezdařilo: %s %d" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" -msgstr "" +msgstr "Automatické ostření není pro tento fotoaparát dostupné" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" -msgstr "" +msgstr "Automatické ostření nebylo přepínatelným prvkem" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" -msgstr "" +msgstr "Nezdařilo se nastavit automatické ostření: %s %d" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" -msgstr "" +msgstr "Ruční ostření není u tohoto fotoaparátu dostupné" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" -msgstr "" +msgstr "Ovládání ručního ostření nebylo prvkem „rozsah“" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" -msgstr "" +msgstr "Nezdařilo se nahrát soubor s definicemi uživatelského rozhraní: %s" #: ../src/frontend/entangle-camera-info.c:299 msgid "Unknown information" -msgstr "" +msgstr "Neznámé sdělení" #: ../src/frontend/entangle-camera-info.c:346 #, c-format msgid "%s Camera Info - Entangle" -msgstr "" +msgstr "%s informace o fotoaparátu - Entangle" #: ../src/frontend/entangle-camera-info.c:349 msgid "Camera Info - Entangle" -msgstr "" +msgstr "Informace o fotoaparátu - Entangle" #. * Local variables: #. * c-indent-level: 4 @@ -232,152 +233,152 @@ #: ../src/frontend/entangle-camera-info.xml.h:1 #: ../src/frontend/entangle-camera-support.xml.h:1 msgid "label" -msgstr "" +msgstr "označení" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" -msgstr "" +msgstr "Tento fotoaparát není možné ovládat z počítače" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" -msgstr "" +msgstr "U tohoto fotoaparátu není možné zobrazovat náhled" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" -msgstr "" +msgstr "Operace: %s" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" -msgstr "" +msgstr "Entangle: operace se nezdařila" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" -msgstr "" +msgstr "Nahrání ovládacích prvků fotoaparátu se nezdařilo" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" -msgstr "" +msgstr "Entangle: nahrání ovládacích prvků fotoaparátu se nezdařilo" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" -msgstr "" +msgstr "Obrazovka" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" -msgstr "" +msgstr "Smazat" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" -msgstr "" +msgstr "Stáhnout" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" -msgstr "" +msgstr "Pořizování snímků" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" -msgstr "" +msgstr "Náhled" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" -msgstr "" +msgstr "Správce fotoaparátů - Entangle" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" -msgstr "" +msgstr "Nezdařilo se připojit fotoaparát: %s" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" " - opened by another photo application\n" " - mounted as a filesystem on the desktop\n" " - in sleep mode to save battery power\n" -msgstr "" +msgstr "Zkontrolujte, zda:\n\n- fotoaparát není používán jinou foto aplikací\n- souborový systém na jeho paměťové kartě není připojen do systému\n- se přístroj nenachází v úsporném režimu (šetření energií v akumulátoru)\n" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" -msgstr "" +msgstr "Storno" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" -msgstr "" +msgstr "Zkusit znovu" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" -msgstr "" +msgstr "Fotoaparát je používán jinou aplikací" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" -msgstr "" +msgstr "Fotoaparát není možné otevřít, protože souborový systém na jeho paměťové kartě je momentálně připojen do systému. Přejete si tento souborový systém odpojit?" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" -msgstr "" +msgstr "Ne" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" -msgstr "" +msgstr "Ano" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" -msgstr "" +msgstr "Navázání spojení s fotoaparátem se nezdařilo." -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" -msgstr "" +msgstr "Entangle: navázání spojení s fotoaparátem se nezdařilo" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" -msgstr "" +msgstr "%s správce fotoaparátů - Entangle" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" -msgstr "" +msgstr "Zvolte složku" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" -msgstr "" +msgstr "Automatické ostření se nezdařilo" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" -msgstr "" +msgstr "Entangle: automatické ostření se nezdařilo" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" -msgstr "" +msgstr "Ruční ostření se nezdařilo" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" -msgstr "" +msgstr "Entangle: ruční ostření se nezdařilo" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." -msgstr "" +msgstr "Zvolte aplikaci…" #. * Local variables: #. * c-indent-level: 4 @@ -392,149 +393,149 @@ #: ../src/frontend/entangle-camera-manager.xml.h:2 msgid "_File" -msgstr "" +msgstr "_Soubor" #: ../src/frontend/entangle-camera-manager.xml.h:3 msgid "Select session" -msgstr "" +msgstr "Zvolit projekt" #: ../src/frontend/entangle-camera-manager.xml.h:4 msgid "Connect camera" -msgstr "" +msgstr "Připojit fotoaparát" #: ../src/frontend/entangle-camera-manager.xml.h:5 msgid "_Edit" -msgstr "" +msgstr "_Úpravy" #: ../src/frontend/entangle-camera-manager.xml.h:6 msgid "_View" -msgstr "" +msgstr "_Zobrazení" #: ../src/frontend/entangle-camera-manager.xml.h:7 msgid "Settings" -msgstr "" +msgstr "Nastavení" #: ../src/frontend/entangle-camera-manager.xml.h:8 msgid "Fullscreen" -msgstr "" +msgstr "Celá obrazovka" #: ../src/frontend/entangle-camera-manager.xml.h:9 msgid "Presentation" -msgstr "" +msgstr "Spustit prezentaci" #: ../src/frontend/entangle-camera-manager.xml.h:10 msgid "Present on" -msgstr "" +msgstr "Zobrazovat na" #: ../src/frontend/entangle-camera-manager.xml.h:11 msgid "Windows" -msgstr "" +msgstr "Okna" #: ../src/frontend/entangle-camera-manager.xml.h:12 msgid "New window" -msgstr "" +msgstr "Nové okno" #: ../src/frontend/entangle-camera-manager.xml.h:13 msgid "Synchronize capture" -msgstr "" +msgstr "Fotografovat najednou na všech připojených přístrojích." #: ../src/frontend/entangle-camera-manager.xml.h:14 msgid "_Help" -msgstr "" +msgstr "_Nápověda" #: ../src/frontend/entangle-camera-manager.xml.h:15 msgid "Camera" -msgstr "" +msgstr "Fotoaparát" #: ../src/frontend/entangle-camera-manager.xml.h:16 msgid "Driver" -msgstr "" +msgstr "Ovladač" #: ../src/frontend/entangle-camera-manager.xml.h:17 msgid "Manual" -msgstr "" +msgstr "Dokumentace" #: ../src/frontend/entangle-camera-manager.xml.h:18 msgid "Supported Cameras" -msgstr "" +msgstr "Podporované fotoaparáty" #: ../src/frontend/entangle-camera-manager.xml.h:20 msgid "View the full list of camera settings" -msgstr "" +msgstr "Zobrazit všechna nastavení\ndostupná pro tento fotoaparát" #: ../src/frontend/entangle-camera-manager.xml.h:21 msgid "Capture an image" -msgstr "" +msgstr "Pořídit snímek" #: ../src/frontend/entangle-camera-manager.xml.h:23 msgid "Continuous capture preview" -msgstr "" +msgstr "Průběžně obnovovat náhled" #: ../src/frontend/entangle-camera-manager.xml.h:25 msgid "" "Attempt to cancel the currently\n" "executing camera operation" -msgstr "" +msgstr "Pokusit se ukončit akci právě\nprobíhající na fotoaparátu" #: ../src/frontend/entangle-camera-manager.xml.h:28 msgid "" "Shrink the display of the image\n" "by one factor" -msgstr "" +msgstr "Zmenšit zobrazení na polovinu" #: ../src/frontend/entangle-camera-manager.xml.h:30 msgid "Zoom Out" -msgstr "" +msgstr "Oddálit" #: ../src/frontend/entangle-camera-manager.xml.h:31 msgid "" "Enlarge the display of the image\n" "by one factor" -msgstr "" +msgstr "Zvětšit zobrazení na dvojnásobek" #: ../src/frontend/entangle-camera-manager.xml.h:33 msgid "Zoom In" -msgstr "" +msgstr "Přiblížit" #: ../src/frontend/entangle-camera-manager.xml.h:34 msgid "" "Resize the image to automatically\n" "fit the available window real estate" -msgstr "" +msgstr "Automaticky přizpůsobovat\nvelikost zobrazování oknu" #: ../src/frontend/entangle-camera-manager.xml.h:36 msgid "Best Fit" -msgstr "" +msgstr "Přizpůsobit velikosti okna" #: ../src/frontend/entangle-camera-manager.xml.h:37 msgid "" "Display the image with its\n" "native pixel size" -msgstr "" +msgstr "Zobrazit v původní velikosti\n(co 1 pixel obrázku, to 1 pixel na obrazovce)" #: ../src/frontend/entangle-camera-manager.xml.h:39 msgid "Normal" -msgstr "" +msgstr "Původní" #: ../src/frontend/entangle-camera-manager.xml.h:40 msgid "Switch to fullscreen display mode" -msgstr "" +msgstr "Zobrazit přes celou obrazovku" #: ../src/frontend/entangle-camera-manager.xml.h:41 msgid "Full Screen" -msgstr "" +msgstr "Celá obrazovka" #: ../src/frontend/entangle-camera-manager.xml.h:42 msgid "Open with" -msgstr "" +msgstr "Otevřít s" #: ../src/frontend/entangle-camera-picker.c:531 msgid "Model" -msgstr "" +msgstr "Výrobce a typ" #: ../src/frontend/entangle-camera-picker.c:532 msgid "Port" -msgstr "" +msgstr "Rozhraní – port" #. * Local variables: #. * c-indent-level: 4 @@ -545,11 +546,11 @@ #. #: ../src/frontend/entangle-camera-picker.xml.h:1 msgid "Select camera - Entangle" -msgstr "" +msgstr "Volba fotoaparátu - Entangle" #: ../src/frontend/entangle-camera-picker.xml.h:2 msgid "Select a camera to connect to:" -msgstr "" +msgstr "Vyberte ke kterému z fotoaparátů se připojit:" #: ../src/frontend/entangle-camera-picker.xml.h:3 msgid "" @@ -562,39 +563,39 @@ "\n" "USB cameras are automatically detected\n" "when plugged in, for others try a refresh" -msgstr "" +msgstr "Nebyly nalezeny žádné fotoaparáty, zkontrolujte zda:\n\n- jsou kabely zapojené\n- je fotoaparát zapnutý\n- je fotoaparát přepnutý do příslušného režimu\n- je tento typ fotoaparátu podporován\n\nFotoaparáty s rozhraním USB jsou po připojení\nrozpoznány automaticky, u ostatních rozhraní\nje po připojení třeba kliknout na tlačítko obnovit." #: ../src/frontend/entangle-control-panel.c:79 msgid "Camera control update failed" -msgstr "" +msgstr "Aktualizace stavu ovládacího prvku se nezdařila" #: ../src/frontend/entangle-control-panel.c:81 msgid "Entangle: Camera control update failed" -msgstr "" +msgstr "Entangle: aktualizace stavu ovládacího prvku se nezdařila" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" -msgstr "" +msgstr "Zapnuto" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" -msgstr "" +msgstr "Vypnuto" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" -msgstr "" +msgstr "Není připojen žádný fotoaparát" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" -msgstr "" +msgstr "Nejsou k dispozici žádné ovládací prvky" #: ../src/frontend/entangle-dpms.c:57 msgid "Screen blanking is not available on this display" -msgstr "" +msgstr "Tuto obrazovku není možné zatmívat." #: ../src/frontend/entangle-dpms.c:69 msgid "Screen blanking is not implemented on this platform" -msgstr "" +msgstr "Pro tento tento operační systém není zatmívání obrazovky ještě dodělané." #. * Local variables: #. * c-indent-level: 4 @@ -605,171 +606,171 @@ #. #: ../src/frontend/entangle-help-about.xml.h:1 msgid "About - Entangle" -msgstr "" +msgstr "O aplikaci - Entangle" #: ../src/frontend/entangle-help-about.xml.h:2 msgid "Copyright (C) 2009-2012 Daniel P. Berrange" -msgstr "" +msgstr "Autorská práva 2009-2012 Daniel P. Berrange" #: ../src/frontend/entangle-help-about.xml.h:3 msgid "Tethered Camera Control & Capture" -msgstr "" +msgstr "Ovládání a pořizování snímků z fotoaparátu přes počítač" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" -msgstr "" +msgstr "Uživatelské rozhraní" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" -msgstr "" +msgstr "Prohlížeč obrázků" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" -msgstr "" +msgstr "Správa přesnosti podání barev" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" -msgstr "" +msgstr "Rozšiřující zásuvné moduly" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" -msgstr "" +msgstr "Barevné profily ICC (*.icc, *.icm)" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" -msgstr "" +msgstr "Všechny soubory (*.*)" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" -msgstr "" +msgstr "1:1 - čtverec / MF 6x6" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" -msgstr "" +msgstr "1.37:1 - 35mm film" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" -msgstr "" +msgstr "1.6:1 (8:5, 16:10) - širokoúhlé" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" -msgstr "" +msgstr "1.75:1 (7:4) - širokoúhlé" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" -msgstr "" +msgstr "1.77:1 (16:9) - APS-H / HDTV / širokoúhlé" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" -msgstr "" +msgstr "1.85:1 - 35mm širokoúhlé" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" -msgstr "" +msgstr "2.20:1 (11:5, 22:10) - 70mm film" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" -msgstr "" +msgstr "12.00:1 - 360° panorama" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" -msgstr "" +msgstr "Žádná" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" -msgstr "" +msgstr "Označení středu" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" -msgstr "" +msgstr "Pravidlo třetin" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" -msgstr "" +msgstr "Čtvrtiny" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" -msgstr "" +msgstr "Pravidlo pětin" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" -msgstr "" +msgstr "Zlaté řezy" #. * Local variables: #. * c-indent-level: 4 @@ -780,116 +781,120 @@ #. #: ../src/frontend/entangle-preferences.xml.h:1 msgid "Perceptual" -msgstr "" +msgstr "Perceptuální (vjemová)" #: ../src/frontend/entangle-preferences.xml.h:2 msgid "Relative colourimetric" -msgstr "" +msgstr "Relativní kolorimetrická" #: ../src/frontend/entangle-preferences.xml.h:3 msgid "Saturation" -msgstr "" +msgstr "Saturační" #: ../src/frontend/entangle-preferences.xml.h:4 msgid "Absolute colourimetric" -msgstr "" +msgstr "Absolutní kolorimetrická" #: ../src/frontend/entangle-preferences.xml.h:5 msgid "Entangle Preferences" -msgstr "" +msgstr "Nastavení Entangle" #: ../src/frontend/entangle-preferences.xml.h:6 msgid "Capture" -msgstr "" +msgstr "Pořizování snímků" #: ../src/frontend/entangle-preferences.xml.h:7 msgid "Filename pattern:" -msgstr "" +msgstr "Struktura názvů souborů:" #: ../src/frontend/entangle-preferences.xml.h:8 msgid "Continue preview mode after capture" -msgstr "" +msgstr "Pokračovat ve zobrazování náhledu i po pořízení snímku" #: ../src/frontend/entangle-preferences.xml.h:9 msgid "Delete file from camera after downloading" -msgstr "" +msgstr "Po stažení do počítače smazat snímek z fotoaparátu" #: ../src/frontend/entangle-preferences.xml.h:11 msgid "Colour management" -msgstr "" +msgstr "Správa přesnosti podání barev" #: ../src/frontend/entangle-preferences.xml.h:12 msgid "Mode of operation:" -msgstr "" +msgstr "Režim:" #: ../src/frontend/entangle-preferences.xml.h:13 msgid "RGB profile:" -msgstr "" +msgstr "RGB profil:" #: ../src/frontend/entangle-preferences.xml.h:14 msgid "Monitor profile:" -msgstr "" +msgstr "Barevný profil monitoru:" #: ../src/frontend/entangle-preferences.xml.h:15 msgid "Rendering intent:" -msgstr "" +msgstr "Metoda korekce barev:" #: ../src/frontend/entangle-preferences.xml.h:16 msgid "Detect the system monitor profile" -msgstr "" +msgstr "Použít barevný profil monitoru z operačního systému" #: ../src/frontend/entangle-preferences.xml.h:17 msgid "Colour managed display" -msgstr "" +msgstr "Obrazovka má seřízené podání barev" #: ../src/frontend/entangle-preferences.xml.h:19 msgid "Plugins" -msgstr "" +msgstr "Rozšiřující zásuvné moduly" #: ../src/frontend/entangle-preferences.xml.h:21 msgid "Interface" -msgstr "" +msgstr "Uživatelské rozhraní" #: ../src/frontend/entangle-preferences.xml.h:22 msgid "Automatically connect to cameras at startup" -msgstr "" +msgstr "Při spuštění aplikace automaticky připojit k fotoaparátu" #: ../src/frontend/entangle-preferences.xml.h:23 msgid "Blank screen when capturing images" -msgstr "" +msgstr "Při spuštění závěrky fotoaparátu zatemnit obrazovku počítače (probliknutí)." -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" -msgstr "" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" +msgstr "Zobrazit lineární histogram" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" -msgstr "" +msgid "Image Viewer" +msgstr "Prohlížeč obrázků" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" -msgstr "" +msgid "Apply mask to alter aspect ratio" +msgstr "Použít masku ke změně poměru stran" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" -msgstr "" +msgid "Aspect ratio:" +msgstr "Poměr stran:" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" -msgstr "" +msgid "Mask opacity:" +msgstr "Průhlednost masky:" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" -msgstr "" +msgid "Display focus point during preview" +msgstr "V náhledu zobrazovat bod, na který se ostří" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" -msgstr "" +msgid "Grid lines:" +msgstr "Kompoziční pomůcka:" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" -msgstr "" +msgid "Use embedded preview from raw files" +msgstr "Používat zapouzdřené náhledy z RAW souborů" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "Zobrazit současně s dřívějšími obrázky (překrývání)" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" -msgstr "" +msgstr "Počet překrývajících se vrstev:" diff -Nru entangle-0.5.1/po/da.po entangle-0.5.2/po/da.po --- entangle-0.5.1/po/da.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/da.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/de.po entangle-0.5.2/po/de.po --- entangle-0.5.1/po/de.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/de.po 2013-08-17 18:27:47.000000000 +0000 @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Fabian Affolter , 2012. -# Mario Blättermann , 2012. -# Roman Spirgi , 2012. +# Fabian Affolter , 2012 +# Mario Blättermann , 2012 +# Roman Spirgi , 2012 msgid "" msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -21,193 +21,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "Fähigkeiten von gphoto 2 können nicht initialisiert werden" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "Fähigkeiten von gphoto 2 können nicht geladen werden" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "Ports von gphoto 2 können nicht initialisiert werden" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "Ports von gphoto 2 können nicht geladen werden" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "Kamera kann nicht initialisiert werden" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "Bildaufnahme ist ohne Verbindung nicht möglich" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "Bild kann nicht aufgenommen werden: %s" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "Bildvorschau ist ohne Verbindung nicht möglich" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "Aufnahmevorschau kann nicht angezeigt werden: %s" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "Daten können nicht geholt werden: %s" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "Dateiname kann nicht geholt werden: %s" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "Herunterladen von Dateien ist ohne Verbindung nicht möglich" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "Kameradatei kann nicht geholt werden: %s" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "Löschen von Dateien ist ohne Verbindung nicht möglich" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "Datei kann nicht gelöscht werden: %s" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "Warten auf Ereignisse ist ohne Verbindung nicht möglich" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "Auf Ereignisse kann nicht gewartet werden: %s" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "Widget-Typ kann nicht ermittelt werden" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "Widget-Name kann nicht ermittelt werden" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "steruerung kann nicht geladen werden, Kamera ist nicht verbunden" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "Konfiguration der Kameraeinstellungen kann nicht ermittelt werden" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "Steuerung kann nicht gespeichert werden, Kamera ist nicht verbunden" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "Steuerung kann nicht gespeichert werden, Kamera ist nicht konfigurierbar" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "Die Konfiguration der Kamerasteuerung konnte nicht gespeichert werden: %s %d" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "Steuerung ist nicht möglich, wenn die Kamera nicht angeschlossen ist" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "Steuerung ist für diese Kamera nicht verfügbar" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "Definitionsdatei der Benutzeroberfläche konnte nicht geladen werden: %s" @@ -237,74 +237,74 @@ msgid "label" msgstr "Bezeichnung" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "Die Kamera unterstützt keine Bildaufnahmen" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "Die Kamera unterstützt keine Bildvorschauen" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "Vorgang: %s" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "Entangle: Vorgang fehlgeschlagen" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "Laden der Kamerasteuerung ist fehlgeschlagen" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "Entangle: Laden der Kamerasteuerung ist fehlgeschlagen" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "Bildschirm" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "Löschen" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "Download" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "Aufnahme" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "Vorschau" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "Kameraverwaltung - Entangle" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "Verbindung zur Kamera fehlgeschlagen: %s" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -313,72 +313,72 @@ " - in sleep mode to save battery power\n" msgstr "Stellen Sie sicher, dass die Kamera nicht\n\n - von einer anderen Fotoanwendung geöffnet ist\n - als Dateisystem eingehängt ist\n - im Ruhezustand ist, um Energie zu sparen\n" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "Abbrechen" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "Wiederholen" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "Kamera ist bereits in Benutzung" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "Die Kamera kann nicht geöffnet werden, da sie derzeit als Dateisystem eingehängt ist. Wollen Sie sie jetzt aushängen?" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "Nein" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "Ja" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "Verbindung zur Kamera ist fehlgeschlagen" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "Entangle: Verbindung zur Kamera fehlgeschlagen" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "%s Kameraverwaltung - Entangle" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "Einen Ordner auswählen" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "Anwendung auswählen …" @@ -575,19 +575,19 @@ msgid "Entangle: Camera control update failed" msgstr "Entangle: Aktualisierung der Kamerasteuerung fehlgeschlagen" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "An" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "Aus" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -618,159 +618,159 @@ msgid "Tethered Camera Control & Capture" msgstr "Steuerung und Aufnahme mit angeschlossenen Kameras" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "Schnittstelle" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "Bildbetrachter" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "Farbverwaltung" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "Plugins" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "ICC-Profile (*.icc, *.icm)" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "Alle Dateien (*.*)" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "1:1 - Quadratisch / MF 6x6" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "1.15:1 - Movietone" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "1.37:1 - 35mm-Film" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "1.44:1 - IMAX" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "1.50:1 (3:2, 15:10)- 35mm SLR" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "1.6:1 (8:5, 16:10) - Breitbild" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "1.66:1 (5:3, 15:9) - Super 16mm" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "1.75:1 (7:4) - Breitbild" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "1.77:1 (16:9) - APS-H / HDTV / Breitbild" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "1.85:1 - 35mm Breitbild" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "2.00:1 - SuperScope" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "2.10:1 (21:10) - Geplant HDTV" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "2.20:1 (11:5, 22:10) - 70mm-Film" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "2.35:1 - CinemaScope" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "2.37:1 (64:27)- HDTV cinema" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "2.39:1 (12:5)- Panavision" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "2.55:1 (23:9)- CinemaScope 55" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "2.59:1 (13:5)- Cinerama" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "2.66:1 (8:3, 24:9)- Super 16mm" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "2.76:1 (11:4) - Ultra Panavision" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "2.93:1 - MGM Camera 65" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "3:1 APS Panorama" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "4.00:1 - Polyvision" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "12.00:1 - Circle-Vision 360" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "Keine" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "Mittellinien" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "Drittelregel" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "Viertel" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "Fünftelregel" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "Goldener Schnitt" @@ -861,38 +861,42 @@ msgid "Blank screen when capturing images" msgstr "Bildschirm während der Aufnahme von Bildern leeren" -#: ../src/frontend/entangle-preferences.xml.h:25 +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:26 msgid "Image Viewer" msgstr "Image Bildbetrachter" -#: ../src/frontend/entangle-preferences.xml.h:26 +#: ../src/frontend/entangle-preferences.xml.h:27 msgid "Apply mask to alter aspect ratio" msgstr "Maske anwenden, um das Seitenverhältnis zu ändern" -#: ../src/frontend/entangle-preferences.xml.h:27 +#: ../src/frontend/entangle-preferences.xml.h:28 msgid "Aspect ratio:" msgstr "Seitenverhältnis:" -#: ../src/frontend/entangle-preferences.xml.h:28 +#: ../src/frontend/entangle-preferences.xml.h:29 msgid "Mask opacity:" msgstr "Deckkraft der Maske:" -#: ../src/frontend/entangle-preferences.xml.h:29 +#: ../src/frontend/entangle-preferences.xml.h:30 msgid "Display focus point during preview" msgstr "Fokuspunkt während der Vorschau anzeigen" -#: ../src/frontend/entangle-preferences.xml.h:30 +#: ../src/frontend/entangle-preferences.xml.h:31 msgid "Grid lines:" msgstr "Gitterlinien:" -#: ../src/frontend/entangle-preferences.xml.h:31 +#: ../src/frontend/entangle-preferences.xml.h:32 msgid "Use embedded preview from raw files" msgstr "In RAW-Dateien eingebettete Vorschau verwenden" -#: ../src/frontend/entangle-preferences.xml.h:32 +#: ../src/frontend/entangle-preferences.xml.h:33 msgid "Overlay earlier images" msgstr "Ältere Bilder überdecken" -#: ../src/frontend/entangle-preferences.xml.h:33 +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "Ebenen überdecken:" diff -Nru entangle-0.5.1/po/el.po entangle-0.5.2/po/el.po --- entangle-0.5.1/po/el.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/el.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/es.po entangle-0.5.2/po/es.po --- entangle-0.5.1/po/es.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/es.po 2013-08-17 18:27:47.000000000 +0000 @@ -3,17 +3,18 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# , 2012. -# Daniel Cabrera , 2012. -# Dennis Tobar , 2012. -# Javier Galnares Arias , 2012. +# alex_pe , 2012 +# Daniel Cabrera , 2012 +# Dennis Tobar , 2012 +# vareli , 2013 +# Javier Galnares Arias , 2012 msgid "" msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" -"Last-Translator: Daniel Berrange \n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-25 08:28+0000\n" +"Last-Translator: vareli \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,196 +23,196 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" -msgstr "" +msgstr "No puede inicializar las habilidades gphoto2" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" -msgstr "" +msgstr "No puede cargar las habilidades gphoto2" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "No se pudo iniciar puertos de gphoto2" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "No se pudo cargar puertos de gphoto2" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "Incapaz de iniciar la cámara" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "No se puede capturar imagen mientras no esté conectada" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "Incapaz de capturar imagen: %s" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "No puedo pre visualizar la imagen sin conección" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "Incapaz de capturar vista previa: %s" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "Incapaz de obtener datos del archivo: %s" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "Incapaz de obtener nombre de archivo: %s" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "No puedo descargar el archivo cuando sin conección" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "Imposible obtener el archivo de la cámara: %s" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "No puedo brorrar el archivo cuando no esta conectado" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "Incapaz de borrar archivo: %s" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" -msgstr "" +msgstr "No puede esperar eventos mientras no conecte" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "Incapaz de esperar por eventos: %s" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" -msgstr "" +msgstr "Incapaz de extraer el tipo widget" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" -msgstr "" +msgstr "Incapaz de extraer el nombre widget" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "Incapaz de cargar controles, la cámara no está conectada" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" -msgstr "" +msgstr "Incapaz de extraer la configuración de control de cámara" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "Incapaz de guardar controles, la cámara no está conectada" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "Incapaz de guardar controles, la cámara no es configurable" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" -msgstr "" +msgstr "Incapaz de guardar la configuración de control de cámara: %s %d" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "Controles no disponibles cuando la cámara está desconectada" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "Controles no disponibles para esta cámara" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" -msgstr "" +msgstr "Control de visor no disponible con esta cámara" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" -msgstr "" +msgstr "El control del visor no era un widget palanca" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" -msgstr "" +msgstr "Fallado al fijar el estado del visor: %s %d" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" -msgstr "" +msgstr "Fallado al fijar el estado de enfoque manual: %s %d" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" -msgstr "" +msgstr "Control de autoenfoque no disponible con esta cámara" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" -msgstr "" +msgstr "El control de autofoco no es un widget palanca" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" -msgstr "" +msgstr "Fallado al fijar el estado del autofoco: %s %d" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" -msgstr "" +msgstr "Control de enfoque manual con esta cámara no disponible" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" -msgstr "" +msgstr "Control de enfoque manual no estaba en rango widget" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" -msgstr "" +msgstr "No podría cargar el fichero de definición de interfaz de usuario: %s" #: ../src/frontend/entangle-camera-info.c:299 msgid "Unknown information" @@ -220,11 +221,11 @@ #: ../src/frontend/entangle-camera-info.c:346 #, c-format msgid "%s Camera Info - Entangle" -msgstr "" +msgstr "%s Información de Cámara - Entangle" #: ../src/frontend/entangle-camera-info.c:349 msgid "Camera Info - Entangle" -msgstr "" +msgstr "Información de Cámara - Entangle" #. * Local variables: #. * c-indent-level: 4 @@ -238,74 +239,74 @@ msgid "label" msgstr "etiqueta" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "Esta cámara no soporta la captura de imágenes" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "Esta cámara no soporta la previsualización de imágenes" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "Operación: %s" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" -msgstr "" +msgstr "Entangle: Operación fallada" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "Falló la carga de controles de la cámara" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" -msgstr "" +msgstr "Entangle: Carga de controles de cámara fallado" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "Monitor" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "Eliminar" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "Descargar" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "Capturar" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "Vista previa" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" -msgstr "" +msgstr "Manejador de Cámara - Entangle" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "Imposible conectar a la cámara: %s" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -314,72 +315,72 @@ " - in sleep mode to save battery power\n" msgstr "Compruebe que la cámara\n\n- no está abierta por otra aplicación\n- no está montada como sistema de ficheros en el escritorio\n- no está en modo bajo consumo para ahorrar batería\n" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "Cancelar" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "Reintentar" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "Cámara en ejecución" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "La cámara no puede ser abierta porque actualmente está montada como sistema de ficheros. ¿Desea desmontarla ahora?" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "No" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "Sí" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "Fallo al conectar con la cámara" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" -msgstr "" +msgstr "Entangle: Conexión de cámara fallada" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" -msgstr "" +msgstr "%s Manejador de Cámara - Entangle" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "Selectionar un directorio" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" -msgstr "" +msgstr "Autoenfoque fallado" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" -msgstr "" +msgstr "Entangle: Autoenfoque de la cámara fallado" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" -msgstr "" +msgstr "Enfoque manual fallado" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" -msgstr "" +msgstr "Entangle: Enfoque manual de la cámara fallado" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "Selecionar aplicacion..." @@ -440,7 +441,7 @@ #: ../src/frontend/entangle-camera-manager.xml.h:13 msgid "Synchronize capture" -msgstr "" +msgstr "Sincronizar captura" #: ../src/frontend/entangle-camera-manager.xml.h:14 msgid "_Help" @@ -574,31 +575,31 @@ #: ../src/frontend/entangle-control-panel.c:81 msgid "Entangle: Camera control update failed" -msgstr "" +msgstr "Entangle: Actualización de Control de cámara fallado" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "Encendido" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "Apagado" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" -msgstr "" +msgstr "Sin cámara conectada" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" -msgstr "" +msgstr "Sin controles disponibles" #: ../src/frontend/entangle-dpms.c:57 msgid "Screen blanking is not available on this display" -msgstr "" +msgstr "La pantalla en blanco no está disponible en este visualización" #: ../src/frontend/entangle-dpms.c:69 msgid "Screen blanking is not implemented on this platform" -msgstr "" +msgstr "La pantalla en blanco no está implementada sobre esta plataforma" #. * Local variables: #. * c-indent-level: 4 @@ -617,163 +618,163 @@ #: ../src/frontend/entangle-help-about.xml.h:3 msgid "Tethered Camera Control & Capture" -msgstr "" +msgstr "Control de la Cámara Atada y Captura" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "Inteface" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "Visor de Imagenes" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "Gestión del color" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" -msgstr "" +msgstr "Plugins" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "Perfiles ICC (*.icc, *.icm)" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "Todos los archivos (*.*)" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" -msgstr "" +msgstr "1:1 - Square / MF 6x6" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" -msgstr "" +msgstr "1.15:1 - Movietone" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" -msgstr "" +msgstr "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" -msgstr "" +msgstr "1.37:1 - 35mm película" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" -msgstr "" +msgstr "1.44:1 - IMAX" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" -msgstr "" +msgstr "1.50:1 (3:2, 15:10)- 35mm SLR" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" -msgstr "" +msgstr "1.6:1 (8:5, 16:10) – Pantalla ancha" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" -msgstr "" +msgstr "1.66:1 (5:3, 15:9) - Super 16mm" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" -msgstr "" +msgstr "1.75:1 (7:4) – Pantalla ancha" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" -msgstr "" +msgstr "1.77:1 (16:9) - APS-H / HDTV / Pantalla ancha" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" -msgstr "" +msgstr "1.85:1 - 35mm Pantalla ancha" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" -msgstr "" +msgstr "2.00:1 - SuperScope" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" -msgstr "" +msgstr "2.10:1 (21:10) - Planned HDTV" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" -msgstr "" +msgstr "2.20:1 (11:5, 22:10) - 70mm película" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" -msgstr "" +msgstr "2.35:1 - CinemaScope" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" -msgstr "" +msgstr "2.37:1 (64:27)- HDTV cinema" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" -msgstr "" +msgstr "2.39:1 (12:5)- Panavision" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" -msgstr "" +msgstr "2.55:1 (23:9)- CinemaScope 55" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" -msgstr "" +msgstr "2.59:1 (13:5)- Cinerama" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" -msgstr "" +msgstr "2.66:1 (8:3, 24:9)- Super 16mm" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" -msgstr "" +msgstr "2.76:1 (11:4) - Ultra Panavision" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" -msgstr "" +msgstr "2.93:1 - MGM Camera 65" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" -msgstr "" +msgstr "3:1 APS Panorama" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" -msgstr "" +msgstr "4.00:1 - Polyvision" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" -msgstr "" +msgstr "12.00:1 - Circle-Vision 360" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" -msgstr "" +msgstr "Ninguno" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" -msgstr "" +msgstr "Centrar líneas" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" -msgstr "" +msgstr "Regla de 3ºs" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" -msgstr "" +msgstr "Cuartos" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" -msgstr "" +msgstr "Regla de 5ºs" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" -msgstr "" +msgstr "Secciones doradas" #. * Local variables: #. * c-indent-level: 4 @@ -784,11 +785,11 @@ #. #: ../src/frontend/entangle-preferences.xml.h:1 msgid "Perceptual" -msgstr "" +msgstr "Perceptivo" #: ../src/frontend/entangle-preferences.xml.h:2 msgid "Relative colourimetric" -msgstr "" +msgstr "Colorimétrico relativo" #: ../src/frontend/entangle-preferences.xml.h:3 msgid "Saturation" @@ -796,11 +797,11 @@ #: ../src/frontend/entangle-preferences.xml.h:4 msgid "Absolute colourimetric" -msgstr "" +msgstr "Colorimétrico absoluto" #: ../src/frontend/entangle-preferences.xml.h:5 msgid "Entangle Preferences" -msgstr "" +msgstr "Preferencias Entangle" #: ../src/frontend/entangle-preferences.xml.h:6 msgid "Capture" @@ -812,7 +813,7 @@ #: ../src/frontend/entangle-preferences.xml.h:8 msgid "Continue preview mode after capture" -msgstr "" +msgstr "Modo de previsualización continúa después de la captura" #: ../src/frontend/entangle-preferences.xml.h:9 msgid "Delete file from camera after downloading" @@ -836,15 +837,15 @@ #: ../src/frontend/entangle-preferences.xml.h:15 msgid "Rendering intent:" -msgstr "" +msgstr "Intento de prestación:" #: ../src/frontend/entangle-preferences.xml.h:16 msgid "Detect the system monitor profile" -msgstr "" +msgstr "Detectado perfil del monitor del sistema" #: ../src/frontend/entangle-preferences.xml.h:17 msgid "Colour managed display" -msgstr "" +msgstr "Visualizador de color manejado" #: ../src/frontend/entangle-preferences.xml.h:19 msgid "Plugins" @@ -852,48 +853,52 @@ #: ../src/frontend/entangle-preferences.xml.h:21 msgid "Interface" -msgstr "" +msgstr "Interfaz" #: ../src/frontend/entangle-preferences.xml.h:22 msgid "Automatically connect to cameras at startup" -msgstr "" +msgstr "Conectar automáticamente a las cámaras al arranque" #: ../src/frontend/entangle-preferences.xml.h:23 msgid "Blank screen when capturing images" -msgstr "" +msgstr "Pantalla en blanco cuando esté capturando imágenes" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" -msgstr "" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" +msgstr "Mostrar histograma lineal" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" -msgstr "" +msgid "Image Viewer" +msgstr "Visualizador de Imagen " #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" -msgstr "" +msgid "Apply mask to alter aspect ratio" +msgstr "Aplicar la máscara para alterar la relación de aspecto" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" -msgstr "" +msgid "Aspect ratio:" +msgstr "Relación de aspecto:" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" -msgstr "" +msgid "Mask opacity:" +msgstr "Opacidad de máscara:" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" -msgstr "" +msgid "Display focus point during preview" +msgstr "Mostrar el punto de enfoque durante la previsualización" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" -msgstr "" +msgid "Grid lines:" +msgstr "Líneas de la cuadrícula:" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" -msgstr "" +msgid "Use embedded preview from raw files" +msgstr "Utilice la vista previa encastrada de archivos raw" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "Superponer imágenes anteriores" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" -msgstr "" +msgstr "Superponer capas:" diff -Nru entangle-0.5.1/po/eu.po entangle-0.5.2/po/eu.po --- entangle-0.5.1/po/eu.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/eu.po 2013-08-17 18:27:47.000000000 +0000 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Asier Iturralde Sarasola , 2012. +# Asier Iturralde Sarasola , 2012 msgid "" msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Basque (http://www.transifex.com/projects/p/fedora/language/eu/)\n" "MIME-Version: 1.0\n" @@ -19,193 +19,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -235,74 +235,74 @@ msgid "label" msgstr "etiketa" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "Ezabatu" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "Deskargatu" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "Aurrebista" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -311,72 +311,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "Utzi" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "Saiatu berriz" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "Ez" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "Bai" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -573,19 +573,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -616,159 +616,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "Kolore kudeaketa" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "Pluginak" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "ICC profilak (*.icc, *.icm)" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "Fitxategi guztiak (*.*)" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -859,38 +859,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/fa.po entangle-0.5.2/po/fa.po --- entangle-0.5.1/po/fa.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/fa.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Persian (http://www.transifex.com/projects/p/fedora/language/fa/)\n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=1; plural=0;\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/fi.po entangle-0.5.2/po/fi.po --- entangle-0.5.1/po/fi.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/fi.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Finnish (http://www.transifex.com/projects/p/fedora/language/fi/)\n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/fr.po entangle-0.5.2/po/fr.po --- entangle-0.5.1/po/fr.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/fr.po 2013-08-17 18:27:47.000000000 +0000 @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Damien Gourbiere , 2012. -# Jérôme Fenal , 2012-2013. +# Damien Gourbiere , 2012 +# Jérôme Fenal , 2012-2013 msgid "" msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-03 15:53+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-05-03 15:50+0000\n" "Last-Translator: Jérôme Fenal \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -20,193 +20,193 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "Impossible d'initialiser les fonctionnalités de gphoto2" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "Impossible de charger les fonctionnalités de gphoto2" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "Impossible d'initialiser les ports de gphoto2" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "Impossible de charger les ports de gphoto2" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "Impossible d'initialiser l'appareil" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "Impossible de capture une image sans connexion à l'appareil" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "Impossible de capture une image : %s" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "Impossible de prévisualiser une image sans connexion à l'appareil" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "Impossible de capturer une prévisualisation : %s" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "Impossible d'obtenir les données du fichier : %s" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "Impossible d'obtenir le nom du fichier : %s" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "Impossible de télécharger une image sans connexion à l'appareil" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "Impossible d'obtenir le fichier de l'appareil : %s" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "Impossible de supprimer un fichier sans connexion à l'appareil" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "Impossible de supprimer un fichier : %s" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "Impossible d'attendre des événements sans connexion à l'appareil" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "Impossible d'attendre des événements : %s" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "Impossible d'obtenir le type de widget" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "Impossible d'obtenir le nom du widget" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "Impossible de charger les contrôles, l'appareil n'est pas connecté" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "Impossible de charger la configuration des contrôles de l'appareil" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "Impossible d'enregistrer les contrôles, l'appareil n'est pas connecté" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "Impossible d'enregistrer les contrôles, l'appareil n'est pas configurable" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "Impossible d'enregistrer la configuration des contrôles de l'appareil : %s %d" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "Les contrôles ne sont pas disponibles lorsque l'appareil est déconnecté" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "Aucun contrôle disponible pour cet appareil" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "Le contrôle du viseur n'est pas disponible pour cet appareil" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "Le contrôle du viseur n'est pas un widget à bascule" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "Impossible de définir l'état du viseur : %s %d" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "Impossible de définir l'état manuel de la focale : %s %d" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "Le contrôle de l'autofocus n'est pas disponible pour cet appareil" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "Le contrôle de l'autofocus n'est pas un widget à bascule" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "Impossible de définir l'état de l'autofocus : %s %d" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "Le contrôle de la focale n'est pas disponible pour cet appareil" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "Le contrôle manuel de la focale n'est pas un widget à intervalle" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "Impossible de charger le fichier de définition d'interface graphique : %s" @@ -236,74 +236,74 @@ msgid "label" msgstr "étiquette" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "Cet appareil ne prend pas en charge la capture d'image" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "Cet appareil ne prend pas en charge la prévisualisation d'image" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "Opération : %s" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "Entangle : échec de l'opération" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "Le chargement des contrôles de l'appareil a échoué" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "Entangle : Le chargement des contrôles de l'appareil a échoué" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "Moniteur" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "Supprimer" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "Télécharger" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "Capturer" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "Prévisualiser" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "Gestionnaire d'appareil photo - Entangle" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "Impossible de se connecter à l'appareil : %s" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -312,72 +312,72 @@ " - in sleep mode to save battery power\n" msgstr "Vérifier que l'appareil photo n'est pas :\n\n - utilisé par une autre application photo,\n - monté en tant que système de fichier sur le bureau,\n - en mode veille afin d'économiser la batterie.\n" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "Annuler" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "Réessayer" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "L'appareil est déjà utilisé" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "L'appareil photo ne peut être utilisé car il est actuellement monté en tant que système de fichier. Souhaitez-vous le démonter maintenant ?" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "Non" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "Oui" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "Échec de la connexion à l'appareil" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "Entangle : échec de la connexion à l'appareil" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "Gestionnaire d'appareil photo %s - Entangle" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "Sélectionner un dossier" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "Échec de l'autofocus" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "Entangle : échec de l'autofocus de l'appareil" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "Échec du changement manuel de focale" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "Entangle : Échec du changement manuel de focale de l'appareil" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "Sélectionner une application..." @@ -574,19 +574,19 @@ msgid "Entangle: Camera control update failed" msgstr "Entangle : la mise à jour des contrôles de l'appareil a échoué" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "Allumé" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "Éteint" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "Aucun appareil connecté" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "Aucun contrôle disponible" @@ -617,159 +617,159 @@ msgid "Tethered Camera Control & Capture" msgstr "Contrôle d'appareil photo et capture asservis" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "Interface" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "Afficheur d'images" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "Gestion de la couleur" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "Greffons" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "Profils ICC (*.icc, *.icm)" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "Tous les fichiers (*.*)" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "1:1 - Carré / MF 6x6" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "1.15:1 - Movietone" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "1.37:1 - 35mm cinéma" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "1.44:1 - IMAX" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "1.50:1 (3:2, 15:10)- 35mm SLR" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "1.6:1 (8:5, 16:10) - Écran large" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "1.66:1 (5:3, 15:9) - Super 16mm" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "1.75:1 (7:4) - Écran large" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "1.77:1 (16:9) - APS-H / HDTV / Écran large" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "1.85:1 - 35mm Écran large" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "2.00:1 - SuperScope" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "2.10:1 (21:10) - Future HDTV" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "2.20:1 (11:5, 22:10) - 70mm cinéma" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "2.35:1 - CinemaScope" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "2.37:1 (64:27)- HDTV cinéma" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "2.39:1 (12:5)- Panavision" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "2.55:1 (23:9)- CinemaScope 55" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "2.59:1 (13:5)- Cinerama" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "2.66:1 (8:3, 24:9)- Super 16mm" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "2.76:1 (11:4) - Ultra Panavision" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "2.93:1 - MGM Camera 65" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "3:1 APS Panorama" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "4.00:1 - Polyvision" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "12.00:1 - Circle-Vision 360" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "Aucun" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "Centrage des lignes" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "Règle des tiers" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "Quarts" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "Règles des 5emes" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "Sections dorées" @@ -860,38 +860,42 @@ msgid "Blank screen when capturing images" msgstr "Effacer l'écran lors de la capture des images" -#: ../src/frontend/entangle-preferences.xml.h:25 +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" +msgstr "Afficher l'histogramme linéaire" + +#: ../src/frontend/entangle-preferences.xml.h:26 msgid "Image Viewer" msgstr "Afficheur d'images" -#: ../src/frontend/entangle-preferences.xml.h:26 +#: ../src/frontend/entangle-preferences.xml.h:27 msgid "Apply mask to alter aspect ratio" msgstr "Appliquer le masque pour modifier le ratio" -#: ../src/frontend/entangle-preferences.xml.h:27 +#: ../src/frontend/entangle-preferences.xml.h:28 msgid "Aspect ratio:" msgstr "Rapport d'aspect :" -#: ../src/frontend/entangle-preferences.xml.h:28 +#: ../src/frontend/entangle-preferences.xml.h:29 msgid "Mask opacity:" msgstr "Opacité du masque :" -#: ../src/frontend/entangle-preferences.xml.h:29 +#: ../src/frontend/entangle-preferences.xml.h:30 msgid "Display focus point during preview" msgstr "Afficher le point de focalisation pendant la prévisualisation" -#: ../src/frontend/entangle-preferences.xml.h:30 +#: ../src/frontend/entangle-preferences.xml.h:31 msgid "Grid lines:" msgstr "Quadrillage :" -#: ../src/frontend/entangle-preferences.xml.h:31 +#: ../src/frontend/entangle-preferences.xml.h:32 msgid "Use embedded preview from raw files" msgstr "Utiliser les vignettes de prévisualisation des fichiers raw" -#: ../src/frontend/entangle-preferences.xml.h:32 +#: ../src/frontend/entangle-preferences.xml.h:33 msgid "Overlay earlier images" msgstr "Ajouter une surcouche à des images précédentes" -#: ../src/frontend/entangle-preferences.xml.h:33 +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "Surcouches :" diff -Nru entangle-0.5.1/po/ga.po entangle-0.5.2/po/ga.po --- entangle-0.5.1/po/ga.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/ga.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Irish (http://www.transifex.com/projects/p/fedora/language/ga/)\n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/gl.po entangle-0.5.2/po/gl.po --- entangle-0.5.1/po/gl.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/gl.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Galician (http://www.transifex.com/projects/p/fedora/language/gl/)\n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/he.po entangle-0.5.2/po/he.po --- entangle-0.5.1/po/he.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/he.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Hebrew \n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/hi.po entangle-0.5.2/po/hi.po --- entangle-0.5.1/po/hi.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/hi.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Hindi \n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/hu.po entangle-0.5.2/po/hu.po --- entangle-0.5.1/po/hu.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/hu.po 2013-08-17 18:27:47.000000000 +0000 @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Zoltan Hoppár , 2012. +# Zoltan Hoppár , 2012-2013 msgid "" msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" -"Last-Translator: Daniel Berrange \n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-06-25 12:34+0000\n" +"Last-Translator: Zoltan Hoppár \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,209 +19,209 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" -msgstr "" +msgstr "A gphoto2 képességei nem beállíthatóak" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" -msgstr "" +msgstr "A gphoto2 képességei nem betölthetőek" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" -msgstr "" +msgstr "A gphoto2 portjai nem beállíthatóak" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" -msgstr "" +msgstr "A gphoto2 portjai nem betölthetőek" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" -msgstr "" +msgstr "Kamera beállítása sikertelen" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" -msgstr "" +msgstr "Képrögzítés sikertelen, amíg nincs csatlakoztatva" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" -msgstr "" +msgstr "Képrögzítés sikertelen: %s" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" -msgstr "" +msgstr "Kép előnézete sikertelen, míg nincs csatlakoztatva" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" -msgstr "" +msgstr "Előnézeti kép rögzítése sikertelen: %s" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" -msgstr "" +msgstr "Fájl adatainak letöltése sikertelen: %s" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" -msgstr "" +msgstr "Fájlnév elérhetetlen: %s" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" -msgstr "" +msgstr "Fájl nem letölthető amíg nincs csatlakoztatva" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" -msgstr "" +msgstr "A kamera fájl elérhetetlen: %s" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" -msgstr "" +msgstr "Nem törölhető amíg nincs csatlakoztatva" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" -msgstr "" +msgstr "Fájl törlése sikertelen: %s" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" -msgstr "" +msgstr "Műveletre várakozás nem lehetséges, amíg nincs csatlakoztatva" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" -msgstr "" +msgstr "Műveletre várakozás nem lehetséges: %s" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" -msgstr "" +msgstr "Widget típus letöltése sikertelen" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" -msgstr "" +msgstr "Widget nevének letöltése sikertelen" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" -msgstr "" +msgstr "Vezérlés nem betölthető, kamera nincs csatlakoztatva" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" -msgstr "" +msgstr "Kamera vezérlési beállításainak letöltése sikertelen" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" -msgstr "" +msgstr "Vezérlés mentése nem lehetséges, kamera nincs csatlakoztatva" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" -msgstr "" +msgstr "Vezérlés mentése nem lehetséges, kamera nem szabályozható" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" -msgstr "" +msgstr "Kamera vezérlési összeállítása nem lehetséges: %s %d" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" -msgstr "" +msgstr "Vezérlés nem elérhető amíg a kamera nincs csatlakoztatva" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" -msgstr "" +msgstr "Vezérlés nem elérhető ehhez a kamerához" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" -msgstr "" +msgstr "Kereső vezérlés nem elérhető ezzel a kamerával" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" -msgstr "" +msgstr "Kereső vezérlés nem volt kapcsoló widget" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" -msgstr "" +msgstr "Sikertelen a kereső állapotának beállítása: %s %d" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" -msgstr "" +msgstr "Manuális fókusz állapotának beállítása sikertelen: %s %d" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" -msgstr "" +msgstr "Autofókusz vezérlés nem elérhető ehhez a kamerához" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" -msgstr "" +msgstr "Autofókusz vezérlés nem kapcsoló widget" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" -msgstr "" +msgstr "Sikertelen az autofókusz kereső állapotának beállítása: %s %d" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" -msgstr "" +msgstr "Kézi fókuszvezérlés nem elérhető ezzel a kamerával" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" -msgstr "" +msgstr "Kézi fókuszvezérlés nem távolsági widget" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" -msgstr "" +msgstr "Fehasználói kezelőfelület leíró fájl nem betölthető: %s" #: ../src/frontend/entangle-camera-info.c:299 msgid "Unknown information" -msgstr "" +msgstr "Ismeretlen információ" #: ../src/frontend/entangle-camera-info.c:346 #, c-format msgid "%s Camera Info - Entangle" -msgstr "" +msgstr "%s kamera információ - Entangle" #: ../src/frontend/entangle-camera-info.c:349 msgid "Camera Info - Entangle" -msgstr "" +msgstr "Kamera Információ - Entangle" #. * Local variables: #. * c-indent-level: 4 @@ -235,150 +235,150 @@ msgid "label" msgstr "címke" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" -msgstr "" +msgstr "Ez a kamera nem támogatja a képrögzítést" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" -msgstr "" +msgstr "Ez a kamera nem támogatja az előnézeti kép megjelenítését" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" -msgstr "" +msgstr "Művelet: %s" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" -msgstr "" +msgstr "Entangle: Művelet sikertelen" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" -msgstr "" +msgstr "Kamera vezérlési betöltése sikertelen" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" -msgstr "" +msgstr "Entangle: Kamera vezérlési betöltése sikertelen" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" -msgstr "" +msgstr "Monitor" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" -msgstr "" +msgstr "Törlés" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" -msgstr "" +msgstr "Letöltés" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" -msgstr "Kép készítés" +msgstr "Képrögzítés" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" -msgstr "" +msgstr "Előnézet" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" -msgstr "" +msgstr "Kamera kezelő - Entangle" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" -msgstr "" +msgstr "Csatlakozás a kamerához sikertelen: %s" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" " - opened by another photo application\n" " - mounted as a filesystem on the desktop\n" " - in sleep mode to save battery power\n" -msgstr "" +msgstr "Ellenőrizze, hogy a kamera:\n\n- nincs megnyitva más fotós alkalmazással ami lefoglalja\n- nincs csatlakoztatva a fájlrendszere az asztalon\n- nincs alvó módban hogy az elemeket kímélje\n" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "Mégsem" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" -msgstr "" +msgstr "Újra" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" -msgstr "" +msgstr "Kamera használatban" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" -msgstr "" +msgstr "A kamera nem megnyitható, mivel a fájlrendszerben csatlakoztatva van. Kívánja, hogy leválasszuk most?" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" -msgstr "" +msgstr "Nem" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" -msgstr "" +msgstr "Igen" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" -msgstr "" +msgstr "Kamera csatlakozása sikertelen" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" -msgstr "" +msgstr "Entangle: Kamera csatlakozása sikertelen" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" -msgstr "" +msgstr "%s Kamera kezelő - Entangle" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" -msgstr "" +msgstr "Válasszon mappát" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" -msgstr "" +msgstr "Autofókuszálás sikertelen" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" -msgstr "" +msgstr "Entangle: Kamera autofókuszálás sikertelen" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" -msgstr "" +msgstr "Manuális fókuszálás sikertelen" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" -msgstr "" +msgstr "Entangle: Kamera manuális fókuszálás sikertelen" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." -msgstr "" +msgstr "Válasszon alkalmazást..." #. * Local variables: #. * c-indent-level: 4 @@ -389,15 +389,15 @@ #. #: ../src/frontend/entangle-camera-manager.xml.h:1 msgid "Entangle" -msgstr "" +msgstr "Entangle" #: ../src/frontend/entangle-camera-manager.xml.h:2 msgid "_File" -msgstr "" +msgstr "_Fájl" #: ../src/frontend/entangle-camera-manager.xml.h:3 msgid "Select session" -msgstr "" +msgstr "Válasszon folyamatot" #: ../src/frontend/entangle-camera-manager.xml.h:4 msgid "Connect camera" @@ -405,43 +405,43 @@ #: ../src/frontend/entangle-camera-manager.xml.h:5 msgid "_Edit" -msgstr "" +msgstr "Sz_erkesztés" #: ../src/frontend/entangle-camera-manager.xml.h:6 msgid "_View" -msgstr "" +msgstr "Nézet" #: ../src/frontend/entangle-camera-manager.xml.h:7 msgid "Settings" -msgstr "" +msgstr "Beállítások" #: ../src/frontend/entangle-camera-manager.xml.h:8 msgid "Fullscreen" -msgstr "" +msgstr "Totálkép" #: ../src/frontend/entangle-camera-manager.xml.h:9 msgid "Presentation" -msgstr "" +msgstr "Bemutató" #: ../src/frontend/entangle-camera-manager.xml.h:10 msgid "Present on" -msgstr "" +msgstr "Megjelenítés ezen:" #: ../src/frontend/entangle-camera-manager.xml.h:11 msgid "Windows" -msgstr "" +msgstr "Ablakok" #: ../src/frontend/entangle-camera-manager.xml.h:12 msgid "New window" -msgstr "" +msgstr "Új ablak" #: ../src/frontend/entangle-camera-manager.xml.h:13 msgid "Synchronize capture" -msgstr "" +msgstr "Képrögzítés szinkronizálása" #: ../src/frontend/entangle-camera-manager.xml.h:14 msgid "_Help" -msgstr "" +msgstr "Súgó" #: ../src/frontend/entangle-camera-manager.xml.h:15 msgid "Camera" @@ -449,23 +449,23 @@ #: ../src/frontend/entangle-camera-manager.xml.h:16 msgid "Driver" -msgstr "" +msgstr "Eszközkezelő" #: ../src/frontend/entangle-camera-manager.xml.h:17 msgid "Manual" -msgstr "" +msgstr "Kézikönyv" #: ../src/frontend/entangle-camera-manager.xml.h:18 msgid "Supported Cameras" -msgstr "" +msgstr "Támogatott kamerák" #: ../src/frontend/entangle-camera-manager.xml.h:20 msgid "View the full list of camera settings" -msgstr "" +msgstr "Kamera beállítások teljes listájának megtekintése" #: ../src/frontend/entangle-camera-manager.xml.h:21 msgid "Capture an image" -msgstr "Kép készítése" +msgstr "Egy kép rögzítése" #: ../src/frontend/entangle-camera-manager.xml.h:23 msgid "Continuous capture preview" @@ -475,67 +475,67 @@ msgid "" "Attempt to cancel the currently\n" "executing camera operation" -msgstr "" +msgstr "Kísérlet a jelenleg végrehajtott\nkamera művelet megszakítására." #: ../src/frontend/entangle-camera-manager.xml.h:28 msgid "" "Shrink the display of the image\n" "by one factor" -msgstr "" +msgstr "Csökkentse a kép megjelenített területét\negy nagyságrenddel" #: ../src/frontend/entangle-camera-manager.xml.h:30 msgid "Zoom Out" -msgstr "" +msgstr "Távolítás" #: ../src/frontend/entangle-camera-manager.xml.h:31 msgid "" "Enlarge the display of the image\n" "by one factor" -msgstr "" +msgstr "Nagyítsa meg a kép megjelenítő területét\negy nagyságrenddel" #: ../src/frontend/entangle-camera-manager.xml.h:33 msgid "Zoom In" -msgstr "" +msgstr "Közelítés" #: ../src/frontend/entangle-camera-manager.xml.h:34 msgid "" "Resize the image to automatically\n" "fit the available window real estate" -msgstr "" +msgstr "Méretezze át a képet automatikusan\nhogy beférjen az ablak valódi keretei közé" #: ../src/frontend/entangle-camera-manager.xml.h:36 msgid "Best Fit" -msgstr "Legjobban passzol" +msgstr "Legjobb illesztés" #: ../src/frontend/entangle-camera-manager.xml.h:37 msgid "" "Display the image with its\n" "native pixel size" -msgstr "" +msgstr "Jelenítse meg a képet\nnatív pixel méreteivel" #: ../src/frontend/entangle-camera-manager.xml.h:39 msgid "Normal" -msgstr "" +msgstr "Normál" #: ../src/frontend/entangle-camera-manager.xml.h:40 msgid "Switch to fullscreen display mode" -msgstr "" +msgstr "Átváltás teljesképernyős megjelenítési módba" #: ../src/frontend/entangle-camera-manager.xml.h:41 msgid "Full Screen" -msgstr "" +msgstr "Teljes képernyő" #: ../src/frontend/entangle-camera-manager.xml.h:42 msgid "Open with" -msgstr "" +msgstr "Megnyitás ezzel:" #: ../src/frontend/entangle-camera-picker.c:531 msgid "Model" -msgstr "" +msgstr "Modell" #: ../src/frontend/entangle-camera-picker.c:532 msgid "Port" -msgstr "" +msgstr "Port" #. * Local variables: #. * c-indent-level: 4 @@ -546,11 +546,11 @@ #. #: ../src/frontend/entangle-camera-picker.xml.h:1 msgid "Select camera - Entangle" -msgstr "" +msgstr "Válasszon kamerát - Entangle" #: ../src/frontend/entangle-camera-picker.xml.h:2 msgid "Select a camera to connect to:" -msgstr "" +msgstr "Válasszon egy kamerát a csatlakozáshoz:" #: ../src/frontend/entangle-camera-picker.xml.h:3 msgid "" @@ -563,39 +563,39 @@ "\n" "USB cameras are automatically detected\n" "when plugged in, for others try a refresh" -msgstr "" +msgstr "Nem látszik semmilyen kamera jelenléte, ellenőrizze hogy\n\n- a kábelek csatlakoztatva vannak\n- a gép be van kapcsolva\n- a gép helyes módban fut\n- a kamera amit használni kíván a program által támogatott modell\n\nUSB kamerák automatikusan detektálásra kerülnek\namikor csatlakoztatja őket, a többi esetben próbáljon frissíteni." #: ../src/frontend/entangle-control-panel.c:79 msgid "Camera control update failed" -msgstr "" +msgstr "Kamera vezérlés frissítése sikertelen" #: ../src/frontend/entangle-control-panel.c:81 msgid "Entangle: Camera control update failed" -msgstr "" +msgstr "Entangle: Kamera vezérlés frissítése sikertelen" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" -msgstr "" +msgstr "Be" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" -msgstr "" +msgstr "Ki" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" -msgstr "" +msgstr "Nincs kamera csatlakoztatva" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" -msgstr "" +msgstr "Nincs elérhető vezérlés" #: ../src/frontend/entangle-dpms.c:57 msgid "Screen blanking is not available on this display" -msgstr "" +msgstr "Képernyő törlése nem lehetséges ezen a kijelzőn" #: ../src/frontend/entangle-dpms.c:69 msgid "Screen blanking is not implemented on this platform" -msgstr "" +msgstr "Képernyőtörlés nincs implementálva ezen a platformon" #. * Local variables: #. * c-indent-level: 4 @@ -606,171 +606,171 @@ #. #: ../src/frontend/entangle-help-about.xml.h:1 msgid "About - Entangle" -msgstr "" +msgstr "Az alkalmazásról - Entangle" #: ../src/frontend/entangle-help-about.xml.h:2 msgid "Copyright (C) 2009-2012 Daniel P. Berrange" -msgstr "" +msgstr "Szerzői jog (C) 2009-2012 Daniel P. Berrange" #: ../src/frontend/entangle-help-about.xml.h:3 msgid "Tethered Camera Control & Capture" -msgstr "" +msgstr "Összekapcsolt kameravezérlés & képrögzítő" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" -msgstr "" +msgstr "Kezelőfelület" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" -msgstr "" +msgstr "Képnéző" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" -msgstr "" +msgstr "Színkezelés" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" -msgstr "" +msgstr "Bővítmények" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" -msgstr "" +msgstr "ICC profilok (*.icc, *.icm)" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" -msgstr "" +msgstr "Minden fájl (*.*)" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" -msgstr "" +msgstr "1:1 - Négyszög / MF 6x6" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" -msgstr "" +msgstr "1.15:1 - Film-rögzítés változó fényerővel" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" -msgstr "" +msgstr "1.33:1 (4:3, 12:9) - Szuper 35mm / DSLR / MF 645" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" -msgstr "" +msgstr "1.37:1 - 35mm mozifilm" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" -msgstr "" +msgstr "1.44:1 - IMAX" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" -msgstr "" +msgstr "1.50:1 (3:2, 15:10)- 35 mm SLR" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" -msgstr "" +msgstr "1.6:1 (8:5, 16:10) - Szélesvásznú" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" -msgstr "" +msgstr "1.66:1 (5:3, 15:9) - Szuper 16 mm" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" -msgstr "" +msgstr "1.75:1 (7:4) - Szélesvásznú" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" -msgstr "" +msgstr "1.77:1 (16:9) - APS-H / HDTV / Szélesvásznú" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" -msgstr "" +msgstr "1.85:1 - 35 mm Szélesvásznú" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" -msgstr "" +msgstr "2.00:1 - SuperScope arány" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" -msgstr "" +msgstr "2.10:1 (21:10) - sík HDTV" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" -msgstr "" +msgstr "2.20:1 (11:5, 22:10) - 70 mm mozifilm" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" -msgstr "" +msgstr "2.35:1 - CinemaScope" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" -msgstr "" +msgstr "2.37:1 (64:27)- HDTV cinema" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" -msgstr "" +msgstr "2.39:1 (12:5) - Panavision" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" -msgstr "" +msgstr "2.55:1 (23:9) - CinemaScope 55" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" -msgstr "" +msgstr "2.59:1 (13:5)- Cinerama" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" -msgstr "" +msgstr "2.66:1 (8:3, 24:9) - Szuper 16mm" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" -msgstr "" +msgstr "2.76:1 (11:4) - Ultra Panavision" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" -msgstr "" +msgstr "2.93:1 - MGM Camera 65" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" -msgstr "" +msgstr "3:1 APS Panoráma" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" -msgstr "" +msgstr "4.00:1 - Polyvision" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" -msgstr "" +msgstr "12.00:1 - Circle-Vision 360" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" -msgstr "" +msgstr "Nincs" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" -msgstr "" +msgstr "Középvonalak" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" -msgstr "" +msgstr "3 osztású szabály" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" -msgstr "" +msgstr "Negyedek" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" -msgstr "" +msgstr "5 osztású szabály" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" -msgstr "" +msgstr "Arany szekciók" #. * Local variables: #. * c-indent-level: 4 @@ -781,116 +781,120 @@ #. #: ../src/frontend/entangle-preferences.xml.h:1 msgid "Perceptual" -msgstr "" +msgstr "Észlelési" #: ../src/frontend/entangle-preferences.xml.h:2 msgid "Relative colourimetric" -msgstr "" +msgstr "Relatív szín-metrikus" #: ../src/frontend/entangle-preferences.xml.h:3 msgid "Saturation" -msgstr "" +msgstr "Telítettség" #: ../src/frontend/entangle-preferences.xml.h:4 msgid "Absolute colourimetric" -msgstr "" +msgstr "Abszolút színmetrikus" #: ../src/frontend/entangle-preferences.xml.h:5 msgid "Entangle Preferences" -msgstr "" +msgstr "Entangle beállításai" #: ../src/frontend/entangle-preferences.xml.h:6 msgid "Capture" -msgstr "" +msgstr "Képrögzítés" #: ../src/frontend/entangle-preferences.xml.h:7 msgid "Filename pattern:" -msgstr "" +msgstr "Fáljnév minta:" #: ../src/frontend/entangle-preferences.xml.h:8 msgid "Continue preview mode after capture" -msgstr "" +msgstr "Előnézeti módban marad képrögzítés után is" #: ../src/frontend/entangle-preferences.xml.h:9 msgid "Delete file from camera after downloading" -msgstr "" +msgstr "Fájl törlése a kameráról a letöltés után" #: ../src/frontend/entangle-preferences.xml.h:11 msgid "Colour management" -msgstr "" +msgstr "Színkezelés" #: ../src/frontend/entangle-preferences.xml.h:12 msgid "Mode of operation:" -msgstr "" +msgstr "Működési mód:" #: ../src/frontend/entangle-preferences.xml.h:13 msgid "RGB profile:" -msgstr "" +msgstr "RGB profil:" #: ../src/frontend/entangle-preferences.xml.h:14 msgid "Monitor profile:" -msgstr "" +msgstr "Monitor profil:" #: ../src/frontend/entangle-preferences.xml.h:15 msgid "Rendering intent:" -msgstr "" +msgstr "Leképezési mód:" #: ../src/frontend/entangle-preferences.xml.h:16 msgid "Detect the system monitor profile" -msgstr "" +msgstr "Érzékelje a rendszer monitor profilját" #: ../src/frontend/entangle-preferences.xml.h:17 msgid "Colour managed display" -msgstr "" +msgstr "Színre beállított kijelző" #: ../src/frontend/entangle-preferences.xml.h:19 msgid "Plugins" -msgstr "" +msgstr "Bővítmények" #: ../src/frontend/entangle-preferences.xml.h:21 msgid "Interface" -msgstr "" +msgstr "Kezelőfelület" #: ../src/frontend/entangle-preferences.xml.h:22 msgid "Automatically connect to cameras at startup" -msgstr "" +msgstr "Automatikusan csatlakoztassa a kamerákat induláskor" #: ../src/frontend/entangle-preferences.xml.h:23 msgid "Blank screen when capturing images" -msgstr "" +msgstr "Törölje a képet ha képet rögzít, fotóz" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" -msgstr "" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" +msgstr "Lineáris hisztogram megjelenítése" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" -msgstr "" +msgid "Image Viewer" +msgstr "Képnéző" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" -msgstr "" +msgid "Apply mask to alter aspect ratio" +msgstr "Maszk alkalmazása a képarányok módosításához" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" -msgstr "" +msgid "Aspect ratio:" +msgstr "Képarány" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" -msgstr "" +msgid "Mask opacity:" +msgstr "Maszk átlászósága" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" -msgstr "" +msgid "Display focus point during preview" +msgstr "Fókuszpont megjelenítése az előnézet alatt" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" -msgstr "" +msgid "Grid lines:" +msgstr "Hálóvonalak:" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" -msgstr "" +msgid "Use embedded preview from raw files" +msgstr "Beépített előnézet használata raw fájlokból" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "Korábbi képek átfedése" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" -msgstr "" +msgstr "Átfedési rétegek:" diff -Nru entangle-0.5.1/po/ia.po entangle-0.5.2/po/ia.po --- entangle-0.5.1/po/ia.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/ia.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Interlingua \n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/id.po entangle-0.5.2/po/id.po --- entangle-0.5.1/po/id.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/id.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Indonesian \n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=1; plural=0;\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/is.po entangle-0.5.2/po/is.po --- entangle-0.5.1/po/is.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/is.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/fedora/language/is/)\n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/it.po entangle-0.5.2/po/it.po --- entangle-0.5.1/po/it.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/it.po 2013-08-17 18:27:47.000000000 +0000 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Cristian Marchi , 2013. +# cri , 2013 msgid "" msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -19,193 +19,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "Impossibile inizializzare le funzionalità di gphoto2" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "Impossibile caricare le funzionalità di gphoto2" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "Impossibile inizializzare le porte di gphoto2" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "Impossibile caricare le porte di gphoto2" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "Impossibile inizializzare la fotocamera" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "Impossibile catturare l'immagine quando la fotocamera non è connessa" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "Impossibile catturare l'immagine: %s" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "Impossibile creare l'anteprima dell'immagine quando la fotocamera non è connessa" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "Impossibile catturare l'anteprima: %s" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "Impossibile ottenere i dati del file: %s" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "Impossibile ottenere il nome del file: %s" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "Impossibile scaricare il file quando la fotocamera non è connessa" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "Impossibile ottenere il file della fotocamera: %s" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "Impossibile eliminare il file quando la fotocamera non è connessa" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "Impossibile eliminare il file: %s" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "Impossibile attendere gli eventi quando la fotocamera non è connessa" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "Impossibile attendere gli eventi: %s" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "Impossibile ottenere il tipo di widget" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "Impossibile ottenere il nome del widget" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "Impossibile caricare i controlli, la fotocamera non è connessa" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "Impossibile ottenere la configurazione dei controlli della fotocamera" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "Impossibile salvare i controlli, la fotocamera non è connessa" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "Impossibile salvare i controlli, la fotocamera non è configurabile" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "Impossibile salvare la configurazione dei controlli della fotocamera: %s %d" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "I controlli non sono disponibili quando la fotocamera non è connessa" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "Controlli non disponibili per questa fotocamera" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "Impossibile caricare il file di definizione dell'interfaccia utente: %s" @@ -235,74 +235,74 @@ msgid "label" msgstr "etichetta" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "Questa fotocamera non supporta la cattura delle immagini" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "Questa fotocamera non supporta l'anteprima dell'immagine" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "Operazione: %s" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "Entangle: operazione non riuscita" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "Caricamento dei controlli della fotocamera non riuscito" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "Entangle: caricamento dei controlli della fotocamera non riuscito" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "Schermo" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "Elimina" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "Scaricati" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "Cattura" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "Anteprima" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "Gestore fotocamera - Entangle" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "Impossibile connettersi alla fotocamera: %s" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -311,72 +311,72 @@ " - in sleep mode to save battery power\n" msgstr "Controllare che la fotocamera non sia:\n\n - in uso da un'altra applicazione;\n - montata come file system;\n - in modalità sleep per il risparmio della batteria.\n" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "Annulla" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "Ritenta" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "La fotocamera è in uso" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "La fotocamera non può essere aperta perché è montata come un file system. Smontarla ora?" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "No" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "Sì" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "Connessione alla fotocamera non riuscita" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "Entangle: connessione alla fotocamera non riuscita" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "Gestore fotocamera %s - Entangle" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "Selezione cartella" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "Selezionare un'applicazione..." @@ -573,19 +573,19 @@ msgid "Entangle: Camera control update failed" msgstr "Entangle: aggiornamento dei controlli della fotocamera non riuscito" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "Attivo" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "Inattivo" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -616,159 +616,159 @@ msgid "Tethered Camera Control & Capture" msgstr "Controllo e cattura dalla fotocamera via cavo" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "Interfaccia" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "Visualizzatore di immagini" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "Gestione del colore" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "Plugin" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "Profili ICC (*.icc, *.icm)" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "Tutti i file (*.*)" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "1:1 - Quadrato / MF 6x6" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "1.15:1 - Movietone" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "1.37:1 - film 35mm" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "1.44:1 - IMAX" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "1.50:1 (3:2, 15:10)- 35mm SLR" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "1.6:1 (8:5, 16:10) - Widescreen" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "1.66:1 (5:3, 15:9) - Super 16mm" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "1.75:1 (7:4) - Widescreen" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "1.77:1 (16:9) - APS-H / HDTV / Widescreen" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "1.85:1 - 35mm Widescreen" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "2.00:1 - SuperScope" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "2.10:1 (21:10) - Planned HDTV" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "2.20:1 (11:5, 22:10) - film 70mm" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "2.35:1 - CinemaScope" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "2.37:1 (64:27)- HDTV cinema" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "2.39:1 (12:5)- Panavision" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "2.55:1 (23:9)- CinemaScope 55" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "2.59:1 (13:5)- Cinerama" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "2.66:1 (8:3, 24:9)- Super 16mm" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "2.76:1 (11:4) - Ultra Panavision" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "2.93:1 - MGM Camera 65" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "3:1 APS Panorama" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "4.00:1 - Polyvision" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "12.00:1 - Circle-Vision 360" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "nessuno" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "Righe centrali" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "Regola dei terzi" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "Quarti" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "Regola dei quinti" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "Sezioni auree" @@ -859,38 +859,42 @@ msgid "Blank screen when capturing images" msgstr "Svuota lo schermo durante la cattura delle immagini" -#: ../src/frontend/entangle-preferences.xml.h:25 +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:26 msgid "Image Viewer" msgstr "Visualizzatore di immagini" -#: ../src/frontend/entangle-preferences.xml.h:26 +#: ../src/frontend/entangle-preferences.xml.h:27 msgid "Apply mask to alter aspect ratio" msgstr "Applica maschera per modificare il rapporto d'aspetto" -#: ../src/frontend/entangle-preferences.xml.h:27 +#: ../src/frontend/entangle-preferences.xml.h:28 msgid "Aspect ratio:" msgstr "Rapporto d'aspetto:" -#: ../src/frontend/entangle-preferences.xml.h:28 +#: ../src/frontend/entangle-preferences.xml.h:29 msgid "Mask opacity:" msgstr "Opacità maschera:" -#: ../src/frontend/entangle-preferences.xml.h:29 +#: ../src/frontend/entangle-preferences.xml.h:30 msgid "Display focus point during preview" msgstr "Mostra il punto di fuoco durante l'anteprima" -#: ../src/frontend/entangle-preferences.xml.h:30 +#: ../src/frontend/entangle-preferences.xml.h:31 msgid "Grid lines:" msgstr "Griglia:" -#: ../src/frontend/entangle-preferences.xml.h:31 +#: ../src/frontend/entangle-preferences.xml.h:32 msgid "Use embedded preview from raw files" msgstr "Usa anteprima contenuta nei file raw" -#: ../src/frontend/entangle-preferences.xml.h:32 +#: ../src/frontend/entangle-preferences.xml.h:33 msgid "Overlay earlier images" msgstr "Sovrapponi le immagini precedenti" -#: ../src/frontend/entangle-preferences.xml.h:33 +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "Livelli di sovrapposizione:" diff -Nru entangle-0.5.1/po/ja.po entangle-0.5.2/po/ja.po --- entangle-0.5.1/po/ja.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/ja.po 2013-08-17 18:27:47.000000000 +0000 @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Tomoyuki KATO , 2012-2013. +# Tomoyuki KATO , 2012-2013 msgid "" msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" -"Last-Translator: Daniel Berrange \n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-06-10 07:11+0000\n" +"Last-Translator: Tomoyuki KATO \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,193 +19,193 @@ "Plural-Forms: nplurals=1; plural=0;\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "gphoto2 機能を初期化できません" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "gphoto2 機能を読み込めません" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "gphoto2 ポートを初期化できません" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "gphoto2 ポートを読み込めません" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "カメラを初期化できません" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "接続していない間は画像をキャプチャーできません" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "画像をキャプチャーできません: %s" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "接続していない間は画像をプレビューできません" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "プレビューをキャプチャーできません: %s" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "ファイルのデータを取得できません: %s" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "ファイル名を取得できません: %s" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "接続されていないときにファイルをダウンロードできません" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "カメラのファイルを取得できません: %s" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "接続されていないときにファイルを削除できません" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "ファイルを削除できません: %s" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "接続されていないときにイベントを待機できません" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "イベントを待機できません: %s" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "ウィジェットの形式を取り出せません" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "装置名を取得できません" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "制御内容を読み込めません、カメラが接続されていません" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "カメラ制御の設定を取得できません" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "制御内容を保存できません、カメラが接続されていません" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "制御内容を保存できません、カメラが設定可能ではありません" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "カメラ制御の設定を保存できません: %s %d" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "カメラが切断されているときに制御は利用可能ではありません" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "このカメラに対して制御は利用できません" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" -msgstr "" +msgstr "Viewfinder 制御がこのカメラで利用できません" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" -msgstr "" +msgstr "Viewfinder 制御がトグルウィジェットではありませんでした" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" -msgstr "" +msgstr "viewfinder の状態の設定に失敗しました: %s %d" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" -msgstr "" +msgstr "マニュアルフォーカスの状態を設定できません: %s %d" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" -msgstr "" +msgstr "オートフォーカスの制御がこのカメラで利用できません" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" -msgstr "" +msgstr "オートフォーカス制御がトグルウィジェットではありませんでした" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" -msgstr "" +msgstr "オートフォーカスの状態を設定できませんでした: %s %d" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" -msgstr "" +msgstr "手動フォーカス制御がこのカメラで利用できません" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" -msgstr "" +msgstr "手動フォーカス制御が範囲ウィジェットではありませんでした" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "ユーザーインターフェース定義ファイルを読み込めませんでした: %s" @@ -235,74 +235,74 @@ msgid "label" msgstr "ラベル" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "このカメラは画像のキャプチャーをサポートしません" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "このカメラは画像のプレビューをサポートしません" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "オペレーション: %s" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "Entangle: オペレーションに失敗しました" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "カメラが制御内容の読み込みに失敗しました" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "Entangle: カメラが制御内容の読み込みに失敗しました" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "モニター" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "削除" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "ダウンロード" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "キャプチャー" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "プレビュー" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "カメラマネージャー - Entangle" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "カメラに接続できません: %s" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -311,72 +311,72 @@ " - in sleep mode to save battery power\n" msgstr "カメラが以下であることを確認します\n\n - 他の写真 アプリケーション により開かれていない\n - デスクトップに ファイルシステム としてマウントされていない\n - バッテリー電源を節約するために スリープモード になっていない\n" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "キャンセル" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "再試行" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "カメラは使用中です" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "現在ファイルシステムとしてマウントされているので、カメラを開けませんでした。今すぐアンマウントしたいですか?" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "いいえ" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "はい" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "カメラの接続に失敗しました" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "Entangle: カメラの接続に失敗しました" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "%s カメラマネージャー - Entangle" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "フォルダーの選択" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" -msgstr "" +msgstr "オートフォーカスに失敗しました" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" -msgstr "" +msgstr "Entangle: カメラのオートフォーカスに失敗しました" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" -msgstr "" +msgstr "マニュアルフォーカスに失敗しました" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" -msgstr "" +msgstr "Entangle: カメラのマニュアルフォーカスに失敗しました" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "アプリケーションの選択..." @@ -573,21 +573,21 @@ msgid "Entangle: Camera control update failed" msgstr "Entangle: カメラの制御内容の更新に失敗しました" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "オン" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "オフ" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" -msgstr "" +msgstr "カメラが接続されていません" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" -msgstr "" +msgstr "制御できるデバイスがありません" #: ../src/frontend/entangle-dpms.c:57 msgid "Screen blanking is not available on this display" @@ -616,159 +616,159 @@ msgid "Tethered Camera Control & Capture" msgstr "接続されたカメラの制御とキャプチャー" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "インターフェース" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "イメージビューアー" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "カラー管理" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "プラグイン" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "ICC プロファイル (*.icc, *.icm)" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "すべてのファイル (*.*)" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "1:1 - 正方形 / MF 6x6" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "1.15:1 - ムービートーン" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "1.33:1 (4:3, 12:9) - スーパー 35mm / DSLR / MF 645" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "1.37:1 - 35mm ムービー" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "1.44:1 - IMAX" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "1.50:1 (3:2, 15:10)- 35mm SLR" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "1.6:1 (8:5, 16:10) - ワイドスクリーン" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "1.66:1 (5:3, 15:9) - スーパー 16mm" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "1.75:1 (7:4) - ワイドスクリーン" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "1.77:1 (16:9) - APS-H / HDTV / ワイドスクリーン" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "1.85:1 - 35mm ワイドスクリーン" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "2.00:1 - スーパースコープ" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "2.10:1 (21:10) - Planned HDTV" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "2.20:1 (11:5, 22:10) - 70mm ムービー" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "2.35:1 - シネマスコープ" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "2.37:1 (64:27)- HDTV シネマ" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "2.39:1 (12:5)- パナビジョン" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "2.55:1 (23:9)- CinemaScope 55" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "2.59:1 (13:5)- Cinerama" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "2.66:1 (8:3, 24:9)- スーパー 16mm" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "2.76:1 (11:4) - ウルトラパナビジョン" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "2.93:1 - MGM カメラ 65" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "3:1 APS パノラマ" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "4.00:1 - Polyvision" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "12.00:1 - Circle-Vision 360" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "なし" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "センターライン" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "三分割法" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "クォーター" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "五分割法" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "ゴールデンセクション" @@ -859,38 +859,42 @@ msgid "Blank screen when capturing images" msgstr "イメージのキャプチャー中に画面を写さない。" -#: ../src/frontend/entangle-preferences.xml.h:25 +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" +msgstr "リニアヒストグラムの表示" + +#: ../src/frontend/entangle-preferences.xml.h:26 msgid "Image Viewer" msgstr "イメージビューアー" -#: ../src/frontend/entangle-preferences.xml.h:26 +#: ../src/frontend/entangle-preferences.xml.h:27 msgid "Apply mask to alter aspect ratio" msgstr "アスペクト比を変更するにはマスクを適用します" -#: ../src/frontend/entangle-preferences.xml.h:27 +#: ../src/frontend/entangle-preferences.xml.h:28 msgid "Aspect ratio:" msgstr "アスペクト比:" -#: ../src/frontend/entangle-preferences.xml.h:28 +#: ../src/frontend/entangle-preferences.xml.h:29 msgid "Mask opacity:" msgstr "不透明度マスク:" -#: ../src/frontend/entangle-preferences.xml.h:29 +#: ../src/frontend/entangle-preferences.xml.h:30 msgid "Display focus point during preview" msgstr "プレビュー中に焦点を表示する" -#: ../src/frontend/entangle-preferences.xml.h:30 +#: ../src/frontend/entangle-preferences.xml.h:31 msgid "Grid lines:" msgstr "グリッド行:" -#: ../src/frontend/entangle-preferences.xml.h:31 +#: ../src/frontend/entangle-preferences.xml.h:32 msgid "Use embedded preview from raw files" msgstr "元ファイルから埋め込みプレビューを使用する" -#: ../src/frontend/entangle-preferences.xml.h:32 +#: ../src/frontend/entangle-preferences.xml.h:33 msgid "Overlay earlier images" msgstr "これまでのイメージを重ね合わせる" -#: ../src/frontend/entangle-preferences.xml.h:33 +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "重ね合わせ層:" diff -Nru entangle-0.5.1/po/ka.po entangle-0.5.2/po/ka.po --- entangle-0.5.1/po/ka.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/ka.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Georgian (http://www.transifex.com/projects/p/fedora/language/ka/)\n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=1; plural=0;\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/kk.po entangle-0.5.2/po/kk.po --- entangle-0.5.1/po/kk.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/kk.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Kazakh (http://www.transifex.com/projects/p/fedora/language/kk/)\n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=1; plural=0;\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/kn.po entangle-0.5.2/po/kn.po --- entangle-0.5.1/po/kn.po 1970-01-01 00:00:00.000000000 +0000 +++ entangle-0.5.2/po/kn.po 2013-08-17 18:27:47.000000000 +0000 @@ -0,0 +1,899 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: Entangle\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" +"Last-Translator: Daniel Berrange \n" +"Language-Team: Kannada (http://www.transifex.com/projects/p/fedora/language/kn/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: kn\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../src/backend/entangle-camera-list.c:218 +#: ../src/backend/entangle-camera.c:746 +#, c-format +msgid "Cannot initialize gphoto2 abilities" +msgstr "" + +#: ../src/backend/entangle-camera-list.c:221 +#: ../src/backend/entangle-camera.c:752 +#, c-format +msgid "Cannot load gphoto2 abilities" +msgstr "" + +#: ../src/backend/entangle-camera-list.c:224 +#: ../src/backend/entangle-camera.c:758 +#, c-format +msgid "Cannot initialize gphoto2 ports" +msgstr "" + +#: ../src/backend/entangle-camera-list.c:227 +#: ../src/backend/entangle-camera.c:764 +#, c-format +msgid "Cannot load gphoto2 ports" +msgstr "" + +#: ../src/backend/entangle-camera.c:795 +#, c-format +msgid "Unable to initialize camera" +msgstr "" + +#: ../src/backend/entangle-camera.c:1054 +msgid "Cannot capture image while not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:1067 +#, c-format +msgid "Unable to capture image: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1153 +msgid "Cannot preview image while not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:1168 +#, c-format +msgid "Unable to capture preview: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 +#, c-format +msgid "Unable to get file data: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1179 +#, c-format +msgid "Unable to get filename: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1275 +msgid "Cannot download file while not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:1297 +#, c-format +msgid "Unable to get camera file: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1392 +msgid "Cannot delete file while not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:1409 +#, c-format +msgid "Unable to delete file: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1491 +msgid "Cannot wait for events while not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:1517 +#, c-format +msgid "Unable to wait for events: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 +#, c-format +msgid "Unable to fetch widget type" +msgstr "" + +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 +#, c-format +msgid "Unable to fetch widget name" +msgstr "" + +#: ../src/backend/entangle-camera.c:2063 +#, c-format +msgid "Unable to load controls, camera is not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:2071 +#, c-format +msgid "Unable to fetch camera control configuration" +msgstr "" + +#: ../src/backend/entangle-camera.c:2158 +#, c-format +msgid "Unable to save controls, camera is not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:2164 +#, c-format +msgid "Unable to save controls, camera is not configurable" +msgstr "" + +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 +#, c-format +msgid "Unable to save camera control configuration: %s %d" +msgstr "" + +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 +#, c-format +msgid "Controls not available when camera is disconnected" +msgstr "" + +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 +#, c-format +msgid "Controls not available for this camera" +msgstr "" + +#: ../src/backend/entangle-camera.c:2304 +#, c-format +msgid "Viewfinder control not available with this camera" +msgstr "" + +#: ../src/backend/entangle-camera.c:2317 +#, c-format +msgid "Viewfinder control was not a toggle widget" +msgstr "" + +#: ../src/backend/entangle-camera.c:2324 +#, c-format +msgid "Failed to set viewfinder state: %s %d" +msgstr "" + +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 +#, c-format +msgid "Failed to set manual focus state: %s %d" +msgstr "" + +#: ../src/backend/entangle-camera.c:2442 +#, c-format +msgid "Autofocus control not available with this camera" +msgstr "" + +#: ../src/backend/entangle-camera.c:2455 +#, c-format +msgid "Autofocus control was not a toggle widget" +msgstr "" + +#: ../src/backend/entangle-camera.c:2462 +#, c-format +msgid "Failed to set autofocus state: %s %d" +msgstr "" + +#: ../src/backend/entangle-camera.c:2568 +#, c-format +msgid "Manual focus control not available with this camera" +msgstr "" + +#: ../src/backend/entangle-camera.c:2581 +#, c-format +msgid "Manual focus control was not a range widget" +msgstr "" + +#: ../src/frontend/entangle-camera-info.c:236 +#: ../src/frontend/entangle-camera-manager.c:3023 +#: ../src/frontend/entangle-camera-picker.c:521 +#: ../src/frontend/entangle-camera-support.c:192 +#: ../src/frontend/entangle-help-about.c:114 +#: ../src/frontend/entangle-image-popup.c:242 +#: ../src/frontend/entangle-preferences-display.c:888 +#, c-format +msgid "Could not load user interface definition file: %s" +msgstr "" + +#: ../src/frontend/entangle-camera-info.c:299 +msgid "Unknown information" +msgstr "" + +#: ../src/frontend/entangle-camera-info.c:346 +#, c-format +msgid "%s Camera Info - Entangle" +msgstr "" + +#: ../src/frontend/entangle-camera-info.c:349 +msgid "Camera Info - Entangle" +msgstr "" + +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * tab-width: 8 +#. * End: +#. +#: ../src/frontend/entangle-camera-info.xml.h:1 +#: ../src/frontend/entangle-camera-support.xml.h:1 +msgid "label" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:537 +msgid "This camera does not support image capture" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:542 +msgid "This camera does not support image preview" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:683 +#, c-format +msgid "Operation: %s" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:685 +msgid "Entangle: Operation failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 +msgid "Camera load controls failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 +msgid "Entangle: Camera load controls failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:756 +msgid "Monitor" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 +msgid "Delete" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:928 +msgid "Download" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 +#: ../src/frontend/entangle-camera-manager.xml.h:22 +#: ../src/frontend/entangle-camera-picker.c:533 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 +#: ../src/frontend/entangle-preferences.xml.h:10 +msgid "Capture" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1060 +#: ../src/frontend/entangle-camera-manager.xml.h:24 +msgid "Preview" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1245 +msgid "Camera Manager - Entangle" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 +#, c-format +msgid "Unable to connect to camera: %s" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 +msgid "" +"Check that the camera is not\n" +"\n" +" - opened by another photo application\n" +" - mounted as a filesystem on the desktop\n" +" - in sleep mode to save battery power\n" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 +#: ../src/frontend/entangle-camera-manager.xml.h:27 +msgid "Cancel" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 +msgid "Retry" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1373 +msgid "Camera is in use" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1377 +msgid "" +"The camera cannot be opened because it is currently mounted as a filesystem." +" Do you wish to umount it now ?" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1381 +#: ../src/frontend/entangle-camera-picker.c:125 +msgid "No" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1382 +#: ../src/frontend/entangle-camera-picker.c:125 +msgid "Yes" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1417 +msgid "Camera connect failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1419 +msgid "Entangle: Camera connect failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1455 +#, c-format +msgid "%s Camera Manager - Entangle" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1808 +#: ../src/frontend/entangle-camera-manager.xml.h:19 +msgid "Select a folder" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:2087 +msgid "Autofocus failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:2089 +msgid "Entangle: Camera autofocus failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:2118 +msgid "Manual focus failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:2120 +msgid "Entangle: Camera manual focus failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:2849 +msgid "Select application..." +msgstr "" + +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * tab-width: 8 +#. * End: +#. +#: ../src/frontend/entangle-camera-manager.xml.h:1 +msgid "Entangle" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:2 +msgid "_File" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:3 +msgid "Select session" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:4 +msgid "Connect camera" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:5 +msgid "_Edit" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:6 +msgid "_View" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:7 +msgid "Settings" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:8 +msgid "Fullscreen" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:9 +msgid "Presentation" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:10 +msgid "Present on" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:11 +msgid "Windows" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:12 +msgid "New window" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:13 +msgid "Synchronize capture" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:14 +msgid "_Help" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:15 +msgid "Camera" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:16 +msgid "Driver" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:17 +msgid "Manual" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:18 +msgid "Supported Cameras" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:20 +msgid "View the full list of camera settings" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:21 +msgid "Capture an image" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:23 +msgid "Continuous capture preview" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:25 +msgid "" +"Attempt to cancel the currently\n" +"executing camera operation" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:28 +msgid "" +"Shrink the display of the image\n" +"by one factor" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:30 +msgid "Zoom Out" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:31 +msgid "" +"Enlarge the display of the image\n" +"by one factor" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:33 +msgid "Zoom In" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:34 +msgid "" +"Resize the image to automatically\n" +"fit the available window real estate" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:36 +msgid "Best Fit" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:37 +msgid "" +"Display the image with its\n" +"native pixel size" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:39 +msgid "Normal" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:40 +msgid "Switch to fullscreen display mode" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:41 +msgid "Full Screen" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:42 +msgid "Open with" +msgstr "" + +#: ../src/frontend/entangle-camera-picker.c:531 +msgid "Model" +msgstr "" + +#: ../src/frontend/entangle-camera-picker.c:532 +msgid "Port" +msgstr "" + +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * tab-width: 8 +#. * End: +#. +#: ../src/frontend/entangle-camera-picker.xml.h:1 +msgid "Select camera - Entangle" +msgstr "" + +#: ../src/frontend/entangle-camera-picker.xml.h:2 +msgid "Select a camera to connect to:" +msgstr "" + +#: ../src/frontend/entangle-camera-picker.xml.h:3 +msgid "" +"No cameras were detected, check that\n" +"\n" +" - the cables are connected\n" +" - the camera is turned on\n" +" - the camera is in the correct mode\n" +" - the camera is a supported model\n" +"\n" +"USB cameras are automatically detected\n" +"when plugged in, for others try a refresh" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:79 +msgid "Camera control update failed" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:81 +msgid "Entangle: Camera control update failed" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:232 +msgid "On" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:232 +msgid "Off" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:559 +msgid "No camera connected" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:568 +msgid "No controls available" +msgstr "" + +#: ../src/frontend/entangle-dpms.c:57 +msgid "Screen blanking is not available on this display" +msgstr "" + +#: ../src/frontend/entangle-dpms.c:69 +msgid "Screen blanking is not implemented on this platform" +msgstr "" + +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * tab-width: 8 +#. * End: +#. +#: ../src/frontend/entangle-help-about.xml.h:1 +msgid "About - Entangle" +msgstr "" + +#: ../src/frontend/entangle-help-about.xml.h:2 +msgid "Copyright (C) 2009-2012 Daniel P. Berrange" +msgstr "" + +#: ../src/frontend/entangle-help-about.xml.h:3 +msgid "Tethered Camera Control & Capture" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 +msgid "Interface" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 +msgid "Image Viewer" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 +#: ../src/frontend/entangle-preferences.xml.h:18 +msgid "Color Management" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 +#: ../src/frontend/entangle-preferences.xml.h:20 +msgid "Plugins" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1030 +msgid "ICC profiles (*.icc, *.icm)" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1035 +msgid "All files (*.*)" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1061 +msgid "1:1 - Square / MF 6x6" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1066 +msgid "1.15:1 - Movietone" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1071 +msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1076 +msgid "1.37:1 - 35mm movie" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1081 +msgid "1.44:1 - IMAX" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1086 +msgid "1.50:1 (3:2, 15:10)- 35mm SLR" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1091 +msgid "1.6:1 (8:5, 16:10) - Widescreen" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1096 +msgid "1.66:1 (5:3, 15:9) - Super 16mm" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1101 +msgid "1.75:1 (7:4) - Widescreen" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1106 +msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1111 +msgid "1.85:1 - 35mm Widescreen" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1116 +msgid "2.00:1 - SuperScope" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1121 +msgid "2.10:1 (21:10) - Planned HDTV" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1126 +msgid "2.20:1 (11:5, 22:10) - 70mm movie" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1131 +msgid "2.35:1 - CinemaScope" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1136 +msgid "2.37:1 (64:27)- HDTV cinema" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1141 +msgid "2.39:1 (12:5)- Panavision" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1146 +msgid "2.55:1 (23:9)- CinemaScope 55" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1151 +msgid "2.59:1 (13:5)- Cinerama" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1156 +msgid "2.66:1 (8:3, 24:9)- Super 16mm" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1161 +msgid "2.76:1 (11:4) - Ultra Panavision" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1166 +msgid "2.93:1 - MGM Camera 65" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1171 +msgid "3:1 APS Panorama" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1176 +msgid "4.00:1 - Polyvision" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1181 +msgid "12.00:1 - Circle-Vision 360" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1199 +msgid "None" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1204 +msgid "Center lines" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1209 +msgid "Rule of 3rds" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1214 +msgid "Quarters" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1219 +msgid "Rule of 5ths" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1224 +msgid "Golden sections" +msgstr "" + +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * tab-width: 8 +#. * End: +#. +#: ../src/frontend/entangle-preferences.xml.h:1 +msgid "Perceptual" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:2 +msgid "Relative colourimetric" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:3 +msgid "Saturation" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:4 +msgid "Absolute colourimetric" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:5 +msgid "Entangle Preferences" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:6 +msgid "Capture" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:7 +msgid "Filename pattern:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:8 +msgid "Continue preview mode after capture" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:9 +msgid "Delete file from camera after downloading" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:11 +msgid "Colour management" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:12 +msgid "Mode of operation:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:13 +msgid "RGB profile:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:14 +msgid "Monitor profile:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:15 +msgid "Rendering intent:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:16 +msgid "Detect the system monitor profile" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:17 +msgid "Colour managed display" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:19 +msgid "Plugins" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:21 +msgid "Interface" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:22 +msgid "Automatically connect to cameras at startup" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:23 +msgid "Blank screen when capturing images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:26 +msgid "Image Viewer" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:27 +msgid "Apply mask to alter aspect ratio" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:28 +msgid "Aspect ratio:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:29 +msgid "Mask opacity:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:30 +msgid "Display focus point during preview" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:31 +msgid "Grid lines:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:32 +msgid "Use embedded preview from raw files" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 +msgid "Overlay layers:" +msgstr "" diff -Nru entangle-0.5.1/po/ko.po entangle-0.5.2/po/ko.po --- entangle-0.5.1/po/ko.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/ko.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Korean (http://www.transifex.com/projects/p/fedora/language/ko/)\n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=1; plural=0;\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/ks.po entangle-0.5.2/po/ks.po --- entangle-0.5.1/po/ks.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/ks.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Kashmiri (http://www.transifex.com/projects/p/fedora/language/ks/)\n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/lv.po entangle-0.5.2/po/lv.po --- entangle-0.5.1/po/lv.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/lv.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Latvian (http://www.transifex.com/projects/p/fedora/language/lv/)\n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/mai.po entangle-0.5.2/po/mai.po --- entangle-0.5.1/po/mai.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/mai.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Maithili (http://www.transifex.com/projects/p/fedora/language/mai/)\n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/ml.po entangle-0.5.2/po/ml.po --- entangle-0.5.1/po/ml.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/ml.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Malayalam \n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/nb.po entangle-0.5.2/po/nb.po --- entangle-0.5.1/po/nb.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/nb.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Norwegian Bokmål \n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/nl.po entangle-0.5.2/po/nl.po --- entangle-0.5.1/po/nl.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/nl.po 2013-08-17 18:27:47.000000000 +0000 @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Geert Warrink , 2013. +# Geert Warrink , 2013 msgid "" msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-05 10:38+0000\n" -"Last-Translator: Geert Warrink \n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" +"Last-Translator: Daniel Berrange \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/fedora/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,193 +19,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -235,74 +235,74 @@ msgid "label" msgstr "label" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "Vastleggen" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "Preview" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -311,72 +311,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "Annuleren" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -573,19 +573,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -616,159 +616,159 @@ msgid "Tethered Camera Control & Capture" msgstr "Gebonden camera controle & vastleggen" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "Kleurbeheer" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -859,38 +859,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/nn.po entangle-0.5.2/po/nn.po --- entangle-0.5.1/po/nn.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/nn.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Norwegian Nynorsk \n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/pl.po entangle-0.5.2/po/pl.po --- entangle-0.5.1/po/pl.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/pl.po 2013-08-17 18:27:47.000000000 +0000 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Piotr Drąg , 2012-2013. +# Piotr Drąg , 2012-2013 msgid "" msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:40+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 21:04+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -19,193 +19,193 @@ "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "Nie można zainicjować możliwości biblioteki gphoto2" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "Nie można wczytać możliwości biblioteki gphoto2" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "Nie można zainicjować portów biblioteki gphoto2" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "Nie można wczytać portów biblioteki gphoto2" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "Nie można zainicjować aparatu" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "Nie można pobrać obrazu, kiedy nie jest połączone" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "Nie można pobrać obrazu: %s" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "Nie można wyświetlić podglądu obrazu, kiedy nie jest połączone" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "Nie można pobrać podglądu: %s" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "Nie można pobrać danych pliku: %s" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "Nie można pobrać nazwy pliku: %s" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "Nie można pobrać pliku, kiedy nie jest połączone" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "Nie można pobrać pliku aparatu: %s" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "Nie można usunąć pliku, kiedy nie jest połączone" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "Nie można usunąć pliku: %s" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "Nie można czekać na zdarzenia, kiedy nie jest połączone" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "Nie można czekać na zdarzenia: %s" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "Nie można pobrać typu widżetu" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "Nie można pobrać nazwy widżetu" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "Nie można wczytać kontroli, aparat nie jest podłączony" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "Nie można pobrać konfiguracji kontroli aparatu" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "Nie można zapisać kontroli, aparat nie jest podłączony" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "Nie można wczytać kontroli, aparat nie jest konfigurowalny" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "Nie można zapisać konfiguracji kontroli aparatu: %s %d" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "Kontrole nie są dostępne, kiedy aparat jest rozłączony" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "Kontrole nie są dostępne dla tego aparatu" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "Kontrola widoku wyszukiwania nie jest dostępna dla tego aparatu" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "Kontrola widoku wyszukiwania nie jest widżetem przełączania" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "Ustawienie stanu widoku wyszukiwania się nie powiodło: %s %d" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "Ustawienie stanu ręcznej ostrości się nie powiodło: %s %d" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "Kontrola automatycznej ostrości nie jest dostępna dla tego aparatu" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "Kontrola automatycznej ostrości nie jest widżetem przełączania" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "Ustawienie stanu automatycznej ostrości się nie powiodło: %s %d" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "Kontrola ręcznej ostrości nie jest dostępna dla tego aparatu" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "Kontrola ręcznej ostrości nie jest widżetem przełączania" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "Nie można wczytać pliku określenia interfejsu użytkownika: %s" @@ -235,74 +235,74 @@ msgid "label" msgstr "etykieta" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "Ten aparat nie obsługuje pobierania obrazów" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "Ten aparat nie obsługuje podglądu obrazów" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "Działanie: %s" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "Entangle: działanie się nie powiodło" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "Kontrole wczytania aparatu się nie powiodły" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "Entangle: kontrole wczytania aparatu się nie powiodły" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "Monitor" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "Usuń" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "Pobierz" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "Pobierz" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "Podgląd" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "Menedżer aparatów - Entangle" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "Nie można połączyć się z aparatem: %s" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -311,72 +311,72 @@ " - in sleep mode to save battery power\n" msgstr "Proszę sprawdzić, czy aparat nie jest:\n\n - otwarty przez inną aplikację do obsługi zdjęć\n - zamontowany jako system plików na pulpicie\n - w trybie uśpienia, aby oszczędzić zasilanie\n" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "Anuluj" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "Ponów" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "Aparat jest używany" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "Nie można otworzyć aparatu, ponieważ jest obecnie zamontowany jako system plików. Odmontować go teraz?" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "Nie" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "Tak" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "Połączenie aparatu się nie powiodło" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "Entangle: połączenie aparatu się nie powiodło" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "Menedżer aparatu %s - Entangle" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "Wybierz katalog" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "Automatyczna ostrość się nie powiodła" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "Entangle: automatyczna ostrość aparatu się nie powiodła" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "Ręczna ostrość się nie powiodła" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "Entangle: ręczna ostrość aparatu się nie powiodła" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "Wybierz program..." @@ -573,19 +573,19 @@ msgid "Entangle: Camera control update failed" msgstr "Entangle: aktualizacja kontroli aparatu się nie powiodła" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "Włączone" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "Wyłączone" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "Nie podłączono aparatu" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "Brak dostępnych kontroli" @@ -616,159 +616,159 @@ msgid "Tethered Camera Control & Capture" msgstr "Kontrola i pobieranie zdjęć z podłączonego aparatu" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "Interfejs" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "Przeglądarka obrazów" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "Zarządzanie kolorami" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "Wtyczki" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "Profile ICC (*.icc, *.icm)" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "Wszystkie pliki (*.*)" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "1:1 - kwadratowy / MF 6x6" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "1.15:1 - Movietone" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "1.37:1 - film 35mm" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "1.44:1 - IMAX" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "1.50:1 (3:2, 15:10)- 35mm SLR" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "1.6:1 (8:5, 16:10) - szeroki ekran" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "1.66:1 (5:3, 15:9) - Super 16mm" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "1.75:1 (7:4) - szeroki ekran" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "1.77:1 (16:9) - APS-H / HDTV / szeroki ekran" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "1.85:1 - szeroki ekran 35mm" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "2.00:1 - SuperScope" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "2.10:1 (21:10) - planowane HDTV" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "2.20:1 (11:5, 22:10) - film 70mm" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "2.35:1 - CinemaScope" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "2.37:1 (64:27)- kino HDTV" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "2.39:1 (12:5)- Panavision" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "2.55:1 (23:9)- CinemaScope 55" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "2.59:1 (13:5)- Cinerama" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "2.66:1 (8:3, 24:9)- Super 16mm" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "2.76:1 (11:4) - Ultra Panavision" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "2.93:1 - MGM Camera 65" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "3:1 panorama APS" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "4.00:1 - Polyvision" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "12.00:1 - Circle-Vision 360" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "Brak" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "Wyśrodkowane linie" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "Jedna trzecia" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "Jedna czwarta" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "Jedna piąta" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "Złoty podział" @@ -859,38 +859,42 @@ msgid "Blank screen when capturing images" msgstr "Wygaszanie ekranu podczas pobierania obrazów" -#: ../src/frontend/entangle-preferences.xml.h:25 +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" +msgstr "Wyświetlanie histogramu liniowego" + +#: ../src/frontend/entangle-preferences.xml.h:26 msgid "Image Viewer" msgstr "Przeglądarka obrazów" -#: ../src/frontend/entangle-preferences.xml.h:26 +#: ../src/frontend/entangle-preferences.xml.h:27 msgid "Apply mask to alter aspect ratio" msgstr "Zastosowanie maski, aby zmienić współczynnik proporcji" -#: ../src/frontend/entangle-preferences.xml.h:27 +#: ../src/frontend/entangle-preferences.xml.h:28 msgid "Aspect ratio:" msgstr "Współczynnik proporcji:" -#: ../src/frontend/entangle-preferences.xml.h:28 +#: ../src/frontend/entangle-preferences.xml.h:29 msgid "Mask opacity:" msgstr "Nieprzezroczystość maski:" -#: ../src/frontend/entangle-preferences.xml.h:29 +#: ../src/frontend/entangle-preferences.xml.h:30 msgid "Display focus point during preview" msgstr "Wyświetlanie punktu ostrości w podglądzie" -#: ../src/frontend/entangle-preferences.xml.h:30 +#: ../src/frontend/entangle-preferences.xml.h:31 msgid "Grid lines:" msgstr "Linie siatki:" -#: ../src/frontend/entangle-preferences.xml.h:31 +#: ../src/frontend/entangle-preferences.xml.h:32 msgid "Use embedded preview from raw files" msgstr "Używa osadzonego podglądu z plików RAW" -#: ../src/frontend/entangle-preferences.xml.h:32 +#: ../src/frontend/entangle-preferences.xml.h:33 msgid "Overlay earlier images" msgstr "Pokrywanie wcześniejszych obrazów" -#: ../src/frontend/entangle-preferences.xml.h:33 +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "Warstwy pokrywania:" diff -Nru entangle-0.5.1/po/pt.po entangle-0.5.2/po/pt.po --- entangle-0.5.1/po/pt.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/pt.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/pt_BR.po entangle-0.5.2/po/pt_BR.po --- entangle-0.5.1/po/pt_BR.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/pt_BR.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Portuguese (Brazil) \n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/ro.po entangle-0.5.2/po/ro.po --- entangle-0.5.1/po/ro.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/ro.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/fedora/language/ro/)\n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/ru.po entangle-0.5.2/po/ru.po --- entangle-0.5.1/po/ru.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/ru.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "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" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/si.po entangle-0.5.2/po/si.po --- entangle-0.5.1/po/si.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/si.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Sinhala (http://www.transifex.com/projects/p/fedora/language/si/)\n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/sk.po entangle-0.5.2/po/sk.po --- entangle-0.5.1/po/sk.po 2013-03-12 21:23:34.000000000 +0000 +++ entangle-0.5.2/po/sk.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Slovak (http://www.transifex.com/projects/p/fedora/language/sk/)\n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/sl.po entangle-0.5.2/po/sl.po --- entangle-0.5.1/po/sl.po 1970-01-01 00:00:00.000000000 +0000 +++ entangle-0.5.2/po/sl.po 2013-08-17 18:27:47.000000000 +0000 @@ -0,0 +1,899 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: Entangle\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" +"Last-Translator: Daniel Berrange \n" +"Language-Team: Slovenian (http://www.transifex.com/projects/p/fedora/language/sl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" + +#: ../src/backend/entangle-camera-list.c:218 +#: ../src/backend/entangle-camera.c:746 +#, c-format +msgid "Cannot initialize gphoto2 abilities" +msgstr "" + +#: ../src/backend/entangle-camera-list.c:221 +#: ../src/backend/entangle-camera.c:752 +#, c-format +msgid "Cannot load gphoto2 abilities" +msgstr "" + +#: ../src/backend/entangle-camera-list.c:224 +#: ../src/backend/entangle-camera.c:758 +#, c-format +msgid "Cannot initialize gphoto2 ports" +msgstr "" + +#: ../src/backend/entangle-camera-list.c:227 +#: ../src/backend/entangle-camera.c:764 +#, c-format +msgid "Cannot load gphoto2 ports" +msgstr "" + +#: ../src/backend/entangle-camera.c:795 +#, c-format +msgid "Unable to initialize camera" +msgstr "" + +#: ../src/backend/entangle-camera.c:1054 +msgid "Cannot capture image while not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:1067 +#, c-format +msgid "Unable to capture image: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1153 +msgid "Cannot preview image while not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:1168 +#, c-format +msgid "Unable to capture preview: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 +#, c-format +msgid "Unable to get file data: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1179 +#, c-format +msgid "Unable to get filename: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1275 +msgid "Cannot download file while not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:1297 +#, c-format +msgid "Unable to get camera file: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1392 +msgid "Cannot delete file while not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:1409 +#, c-format +msgid "Unable to delete file: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1491 +msgid "Cannot wait for events while not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:1517 +#, c-format +msgid "Unable to wait for events: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 +#, c-format +msgid "Unable to fetch widget type" +msgstr "" + +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 +#, c-format +msgid "Unable to fetch widget name" +msgstr "" + +#: ../src/backend/entangle-camera.c:2063 +#, c-format +msgid "Unable to load controls, camera is not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:2071 +#, c-format +msgid "Unable to fetch camera control configuration" +msgstr "" + +#: ../src/backend/entangle-camera.c:2158 +#, c-format +msgid "Unable to save controls, camera is not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:2164 +#, c-format +msgid "Unable to save controls, camera is not configurable" +msgstr "" + +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 +#, c-format +msgid "Unable to save camera control configuration: %s %d" +msgstr "" + +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 +#, c-format +msgid "Controls not available when camera is disconnected" +msgstr "" + +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 +#, c-format +msgid "Controls not available for this camera" +msgstr "" + +#: ../src/backend/entangle-camera.c:2304 +#, c-format +msgid "Viewfinder control not available with this camera" +msgstr "" + +#: ../src/backend/entangle-camera.c:2317 +#, c-format +msgid "Viewfinder control was not a toggle widget" +msgstr "" + +#: ../src/backend/entangle-camera.c:2324 +#, c-format +msgid "Failed to set viewfinder state: %s %d" +msgstr "" + +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 +#, c-format +msgid "Failed to set manual focus state: %s %d" +msgstr "" + +#: ../src/backend/entangle-camera.c:2442 +#, c-format +msgid "Autofocus control not available with this camera" +msgstr "" + +#: ../src/backend/entangle-camera.c:2455 +#, c-format +msgid "Autofocus control was not a toggle widget" +msgstr "" + +#: ../src/backend/entangle-camera.c:2462 +#, c-format +msgid "Failed to set autofocus state: %s %d" +msgstr "" + +#: ../src/backend/entangle-camera.c:2568 +#, c-format +msgid "Manual focus control not available with this camera" +msgstr "" + +#: ../src/backend/entangle-camera.c:2581 +#, c-format +msgid "Manual focus control was not a range widget" +msgstr "" + +#: ../src/frontend/entangle-camera-info.c:236 +#: ../src/frontend/entangle-camera-manager.c:3023 +#: ../src/frontend/entangle-camera-picker.c:521 +#: ../src/frontend/entangle-camera-support.c:192 +#: ../src/frontend/entangle-help-about.c:114 +#: ../src/frontend/entangle-image-popup.c:242 +#: ../src/frontend/entangle-preferences-display.c:888 +#, c-format +msgid "Could not load user interface definition file: %s" +msgstr "" + +#: ../src/frontend/entangle-camera-info.c:299 +msgid "Unknown information" +msgstr "" + +#: ../src/frontend/entangle-camera-info.c:346 +#, c-format +msgid "%s Camera Info - Entangle" +msgstr "" + +#: ../src/frontend/entangle-camera-info.c:349 +msgid "Camera Info - Entangle" +msgstr "" + +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * tab-width: 8 +#. * End: +#. +#: ../src/frontend/entangle-camera-info.xml.h:1 +#: ../src/frontend/entangle-camera-support.xml.h:1 +msgid "label" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:537 +msgid "This camera does not support image capture" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:542 +msgid "This camera does not support image preview" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:683 +#, c-format +msgid "Operation: %s" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:685 +msgid "Entangle: Operation failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 +msgid "Camera load controls failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 +msgid "Entangle: Camera load controls failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:756 +msgid "Monitor" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 +msgid "Delete" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:928 +msgid "Download" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 +#: ../src/frontend/entangle-camera-manager.xml.h:22 +#: ../src/frontend/entangle-camera-picker.c:533 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 +#: ../src/frontend/entangle-preferences.xml.h:10 +msgid "Capture" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1060 +#: ../src/frontend/entangle-camera-manager.xml.h:24 +msgid "Preview" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1245 +msgid "Camera Manager - Entangle" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 +#, c-format +msgid "Unable to connect to camera: %s" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 +msgid "" +"Check that the camera is not\n" +"\n" +" - opened by another photo application\n" +" - mounted as a filesystem on the desktop\n" +" - in sleep mode to save battery power\n" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 +#: ../src/frontend/entangle-camera-manager.xml.h:27 +msgid "Cancel" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 +msgid "Retry" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1373 +msgid "Camera is in use" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1377 +msgid "" +"The camera cannot be opened because it is currently mounted as a filesystem." +" Do you wish to umount it now ?" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1381 +#: ../src/frontend/entangle-camera-picker.c:125 +msgid "No" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1382 +#: ../src/frontend/entangle-camera-picker.c:125 +msgid "Yes" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1417 +msgid "Camera connect failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1419 +msgid "Entangle: Camera connect failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1455 +#, c-format +msgid "%s Camera Manager - Entangle" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1808 +#: ../src/frontend/entangle-camera-manager.xml.h:19 +msgid "Select a folder" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:2087 +msgid "Autofocus failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:2089 +msgid "Entangle: Camera autofocus failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:2118 +msgid "Manual focus failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:2120 +msgid "Entangle: Camera manual focus failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:2849 +msgid "Select application..." +msgstr "" + +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * tab-width: 8 +#. * End: +#. +#: ../src/frontend/entangle-camera-manager.xml.h:1 +msgid "Entangle" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:2 +msgid "_File" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:3 +msgid "Select session" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:4 +msgid "Connect camera" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:5 +msgid "_Edit" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:6 +msgid "_View" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:7 +msgid "Settings" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:8 +msgid "Fullscreen" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:9 +msgid "Presentation" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:10 +msgid "Present on" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:11 +msgid "Windows" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:12 +msgid "New window" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:13 +msgid "Synchronize capture" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:14 +msgid "_Help" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:15 +msgid "Camera" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:16 +msgid "Driver" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:17 +msgid "Manual" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:18 +msgid "Supported Cameras" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:20 +msgid "View the full list of camera settings" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:21 +msgid "Capture an image" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:23 +msgid "Continuous capture preview" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:25 +msgid "" +"Attempt to cancel the currently\n" +"executing camera operation" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:28 +msgid "" +"Shrink the display of the image\n" +"by one factor" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:30 +msgid "Zoom Out" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:31 +msgid "" +"Enlarge the display of the image\n" +"by one factor" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:33 +msgid "Zoom In" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:34 +msgid "" +"Resize the image to automatically\n" +"fit the available window real estate" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:36 +msgid "Best Fit" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:37 +msgid "" +"Display the image with its\n" +"native pixel size" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:39 +msgid "Normal" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:40 +msgid "Switch to fullscreen display mode" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:41 +msgid "Full Screen" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:42 +msgid "Open with" +msgstr "" + +#: ../src/frontend/entangle-camera-picker.c:531 +msgid "Model" +msgstr "" + +#: ../src/frontend/entangle-camera-picker.c:532 +msgid "Port" +msgstr "" + +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * tab-width: 8 +#. * End: +#. +#: ../src/frontend/entangle-camera-picker.xml.h:1 +msgid "Select camera - Entangle" +msgstr "" + +#: ../src/frontend/entangle-camera-picker.xml.h:2 +msgid "Select a camera to connect to:" +msgstr "" + +#: ../src/frontend/entangle-camera-picker.xml.h:3 +msgid "" +"No cameras were detected, check that\n" +"\n" +" - the cables are connected\n" +" - the camera is turned on\n" +" - the camera is in the correct mode\n" +" - the camera is a supported model\n" +"\n" +"USB cameras are automatically detected\n" +"when plugged in, for others try a refresh" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:79 +msgid "Camera control update failed" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:81 +msgid "Entangle: Camera control update failed" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:232 +msgid "On" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:232 +msgid "Off" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:559 +msgid "No camera connected" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:568 +msgid "No controls available" +msgstr "" + +#: ../src/frontend/entangle-dpms.c:57 +msgid "Screen blanking is not available on this display" +msgstr "" + +#: ../src/frontend/entangle-dpms.c:69 +msgid "Screen blanking is not implemented on this platform" +msgstr "" + +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * tab-width: 8 +#. * End: +#. +#: ../src/frontend/entangle-help-about.xml.h:1 +msgid "About - Entangle" +msgstr "" + +#: ../src/frontend/entangle-help-about.xml.h:2 +msgid "Copyright (C) 2009-2012 Daniel P. Berrange" +msgstr "" + +#: ../src/frontend/entangle-help-about.xml.h:3 +msgid "Tethered Camera Control & Capture" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 +msgid "Interface" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 +msgid "Image Viewer" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 +#: ../src/frontend/entangle-preferences.xml.h:18 +msgid "Color Management" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 +#: ../src/frontend/entangle-preferences.xml.h:20 +msgid "Plugins" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1030 +msgid "ICC profiles (*.icc, *.icm)" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1035 +msgid "All files (*.*)" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1061 +msgid "1:1 - Square / MF 6x6" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1066 +msgid "1.15:1 - Movietone" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1071 +msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1076 +msgid "1.37:1 - 35mm movie" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1081 +msgid "1.44:1 - IMAX" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1086 +msgid "1.50:1 (3:2, 15:10)- 35mm SLR" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1091 +msgid "1.6:1 (8:5, 16:10) - Widescreen" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1096 +msgid "1.66:1 (5:3, 15:9) - Super 16mm" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1101 +msgid "1.75:1 (7:4) - Widescreen" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1106 +msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1111 +msgid "1.85:1 - 35mm Widescreen" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1116 +msgid "2.00:1 - SuperScope" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1121 +msgid "2.10:1 (21:10) - Planned HDTV" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1126 +msgid "2.20:1 (11:5, 22:10) - 70mm movie" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1131 +msgid "2.35:1 - CinemaScope" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1136 +msgid "2.37:1 (64:27)- HDTV cinema" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1141 +msgid "2.39:1 (12:5)- Panavision" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1146 +msgid "2.55:1 (23:9)- CinemaScope 55" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1151 +msgid "2.59:1 (13:5)- Cinerama" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1156 +msgid "2.66:1 (8:3, 24:9)- Super 16mm" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1161 +msgid "2.76:1 (11:4) - Ultra Panavision" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1166 +msgid "2.93:1 - MGM Camera 65" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1171 +msgid "3:1 APS Panorama" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1176 +msgid "4.00:1 - Polyvision" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1181 +msgid "12.00:1 - Circle-Vision 360" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1199 +msgid "None" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1204 +msgid "Center lines" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1209 +msgid "Rule of 3rds" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1214 +msgid "Quarters" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1219 +msgid "Rule of 5ths" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1224 +msgid "Golden sections" +msgstr "" + +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * tab-width: 8 +#. * End: +#. +#: ../src/frontend/entangle-preferences.xml.h:1 +msgid "Perceptual" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:2 +msgid "Relative colourimetric" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:3 +msgid "Saturation" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:4 +msgid "Absolute colourimetric" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:5 +msgid "Entangle Preferences" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:6 +msgid "Capture" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:7 +msgid "Filename pattern:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:8 +msgid "Continue preview mode after capture" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:9 +msgid "Delete file from camera after downloading" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:11 +msgid "Colour management" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:12 +msgid "Mode of operation:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:13 +msgid "RGB profile:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:14 +msgid "Monitor profile:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:15 +msgid "Rendering intent:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:16 +msgid "Detect the system monitor profile" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:17 +msgid "Colour managed display" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:19 +msgid "Plugins" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:21 +msgid "Interface" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:22 +msgid "Automatically connect to cameras at startup" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:23 +msgid "Blank screen when capturing images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:26 +msgid "Image Viewer" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:27 +msgid "Apply mask to alter aspect ratio" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:28 +msgid "Aspect ratio:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:29 +msgid "Mask opacity:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:30 +msgid "Display focus point during preview" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:31 +msgid "Grid lines:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:32 +msgid "Use embedded preview from raw files" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 +msgid "Overlay layers:" +msgstr "" diff -Nru entangle-0.5.1/po/sq.po entangle-0.5.2/po/sq.po --- entangle-0.5.1/po/sq.po 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/po/sq.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Albanian (http://www.transifex.com/projects/p/fedora/language/sq/)\n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/sr.po entangle-0.5.2/po/sr.po --- entangle-0.5.1/po/sr.po 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/po/sr.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "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" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/sv.po entangle-0.5.2/po/sv.po --- entangle-0.5.1/po/sv.po 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/po/sv.po 2013-08-17 18:27:47.000000000 +0000 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Göran Uddeborg , 2012. +# Göran Uddeborg , 2012 msgid "" msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/fedora/language/sv/)\n" "MIME-Version: 1.0\n" @@ -19,193 +19,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "Kan inte initiera gphoto2:s egenskaper" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "Kan inte ladda gphoto2:s egenskaper" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "Kan inte initiera gphoto2:s portar" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "Kan inte ladda gphoto2:s portar" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "Kan inte initiera kameran" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "Kan inte fånga bilder utan anslutning" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "Kan inte fånga en bild: %s" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "Kan inte förhandsvisa en bild utan anslutning" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "Kan inte fånga en förhandsvisning: %s" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "Kan inte hämta fildata: %s" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "Kan inte hämta filnamnet: %s" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "Kan inte hämta filen utan anslutning" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "Kan inte hämta fil från kameran: %s" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "Kan inte radera en fil utan anslutning" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "Kan inte radera filen: %s" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "Kan inte vänta på händelser utan anslutning" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "Kan inte vänta på händelser: %s" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "Kan inte ta fram widget-typen" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "Kan inte ta fram widget-namnet" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "Kan inte ladda kontroller, kameran är inte ansluten" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "Kan inte ta fram kamerans kontrollkonfiguration" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "Kan inte spara kontroller, kameran är inte ansluten" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "Kan inte spara kontroller, kameran är inte konfigurerbar" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "Kan inte spara kamerans kontrollkonfiguration: %s %d" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "Kontroller är inte tillgängliga när kameran inte är ansluten" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "Kontroller är inte tillgängliga för denna kamera" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "Kunde inte ladda definitionsfilen för användargränssnittet: %s" @@ -235,74 +235,74 @@ msgid "label" msgstr "etikett" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "Denna kamera stödjer inte fångst av bilder" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "Denna kamera stödjer inte förhandsvisning av bilder" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "Åtgärd: %s" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "Entangle: Åtgärden misslyckades" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "Laddning av kamerakontroller misslyckades" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "Entangle: Laddning av kamerakontroller misslyckades" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "Övervaka" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "Radera" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "Hämta" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "Fånga" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "Förhandsvisning" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "Kamerahanterare - Entangle" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "Kan inte ansluta till kameran: %s" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -311,72 +311,72 @@ " - in sleep mode to save battery power\n" msgstr "Kontrollera att kameran inte är\n\n - öppnad av ett annat fotoprogram\n - monterad som ett filsystem på skrivbordet\n - i sovläge för att spara ström\n" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "Avbryt" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "Försök igen" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "Kameran används" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "Kameran kan inte öppnas för att den just nu är monterad som ett filsystem. Vill du avmontera den nu?" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "Nej" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "Ja" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "Anslutning till kameran misslyckades" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "Entangle: Anslutning till kameran misslyckades" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "%s kamerahanterare - Entangle" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "Välj en mapp" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "Välj program…" @@ -573,19 +573,19 @@ msgid "Entangle: Camera control update failed" msgstr "Entangle: Uppdatering av kamerakontroller misslyckades" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "På" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "Av" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -616,159 +616,159 @@ msgid "Tethered Camera Control & Capture" msgstr "Tjudrad kamerakontroll och -fångst" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "Gränssnitt" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "Bildvisare" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "Färghantering" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "Insticksmoduler" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "ICC-profiler (*.icc, *.icm)" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "Alla filer (*.*)" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "1:1 - Kvadratisk / MF 6×6" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "1.15:1 - Movietone" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "1.37:1 - 35mm film" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "1.44:1 - IMAX" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "1.50:1 (3:2, 15:10)- 35mm SLR" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "1.6:1 (8:5, 16:10) - Bredbild" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "1.66:1 (5:3, 15:9) - Super 16mm" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "1.75:1 (7:4) - Bredbild" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "1.77:1 (16:9) - APS-H / HDTV / Bredbild" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "1.85:1 - 35mm Bredbild" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "2.00:1 - SuperScope" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "2.10:1 (21:10) - Planerad HDTV" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "2.20:1 (11:5, 22:10) - 70mm film" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "2.35:1 - CinemaScope" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "2.37:1 (64:27)- HDTV cinema" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "2.39:1 (12:5)- Panavision" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "2.55:1 (23:9)- CinemaScope 55" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "2.59:1 (13:5)- Cinerama" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "2.66:1 (8:3, 24:9)- Super 16mm" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "2.76:1 (11:4) - Ultra Panavision" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "2.93:1 - MGM Camera 65" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "3:1 APS Panorama" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "4.00:1 - Polyvision" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "12.00:1 - Circle-Vision 360" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "Ingen" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "Mittlinjer" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "Tredjedelsregeln" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "Fjärdedelar" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "Femtedelsregeln" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "Gyllene snittet" @@ -859,38 +859,42 @@ msgid "Blank screen when capturing images" msgstr "Töm skärmen när bilder fångas" -#: ../src/frontend/entangle-preferences.xml.h:25 +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:26 msgid "Image Viewer" msgstr "Bildvisare" -#: ../src/frontend/entangle-preferences.xml.h:26 +#: ../src/frontend/entangle-preferences.xml.h:27 msgid "Apply mask to alter aspect ratio" msgstr "Använd mask för att ändra bildformat" -#: ../src/frontend/entangle-preferences.xml.h:27 +#: ../src/frontend/entangle-preferences.xml.h:28 msgid "Aspect ratio:" msgstr "Bildformat:" -#: ../src/frontend/entangle-preferences.xml.h:28 +#: ../src/frontend/entangle-preferences.xml.h:29 msgid "Mask opacity:" msgstr "Maskogenomskinlighet:" -#: ../src/frontend/entangle-preferences.xml.h:29 +#: ../src/frontend/entangle-preferences.xml.h:30 msgid "Display focus point during preview" msgstr "Visa fokuspunkt under förhandsvisning" -#: ../src/frontend/entangle-preferences.xml.h:30 +#: ../src/frontend/entangle-preferences.xml.h:31 msgid "Grid lines:" msgstr "Rutmönster:" -#: ../src/frontend/entangle-preferences.xml.h:31 +#: ../src/frontend/entangle-preferences.xml.h:32 msgid "Use embedded preview from raw files" msgstr "Använd inbäddad förhandsvisning från råa filer" -#: ../src/frontend/entangle-preferences.xml.h:32 +#: ../src/frontend/entangle-preferences.xml.h:33 msgid "Overlay earlier images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:33 +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/ta.po entangle-0.5.2/po/ta.po --- entangle-0.5.1/po/ta.po 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/po/ta.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Tamil \n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/te.po entangle-0.5.2/po/te.po --- entangle-0.5.1/po/te.po 1970-01-01 00:00:00.000000000 +0000 +++ entangle-0.5.2/po/te.po 2013-08-17 18:27:47.000000000 +0000 @@ -0,0 +1,899 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: Entangle\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" +"Last-Translator: Daniel Berrange \n" +"Language-Team: Telugu (http://www.transifex.com/projects/p/fedora/language/te/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: te\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../src/backend/entangle-camera-list.c:218 +#: ../src/backend/entangle-camera.c:746 +#, c-format +msgid "Cannot initialize gphoto2 abilities" +msgstr "" + +#: ../src/backend/entangle-camera-list.c:221 +#: ../src/backend/entangle-camera.c:752 +#, c-format +msgid "Cannot load gphoto2 abilities" +msgstr "" + +#: ../src/backend/entangle-camera-list.c:224 +#: ../src/backend/entangle-camera.c:758 +#, c-format +msgid "Cannot initialize gphoto2 ports" +msgstr "" + +#: ../src/backend/entangle-camera-list.c:227 +#: ../src/backend/entangle-camera.c:764 +#, c-format +msgid "Cannot load gphoto2 ports" +msgstr "" + +#: ../src/backend/entangle-camera.c:795 +#, c-format +msgid "Unable to initialize camera" +msgstr "" + +#: ../src/backend/entangle-camera.c:1054 +msgid "Cannot capture image while not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:1067 +#, c-format +msgid "Unable to capture image: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1153 +msgid "Cannot preview image while not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:1168 +#, c-format +msgid "Unable to capture preview: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 +#, c-format +msgid "Unable to get file data: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1179 +#, c-format +msgid "Unable to get filename: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1275 +msgid "Cannot download file while not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:1297 +#, c-format +msgid "Unable to get camera file: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1392 +msgid "Cannot delete file while not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:1409 +#, c-format +msgid "Unable to delete file: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1491 +msgid "Cannot wait for events while not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:1517 +#, c-format +msgid "Unable to wait for events: %s" +msgstr "" + +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 +#, c-format +msgid "Unable to fetch widget type" +msgstr "" + +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 +#, c-format +msgid "Unable to fetch widget name" +msgstr "" + +#: ../src/backend/entangle-camera.c:2063 +#, c-format +msgid "Unable to load controls, camera is not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:2071 +#, c-format +msgid "Unable to fetch camera control configuration" +msgstr "" + +#: ../src/backend/entangle-camera.c:2158 +#, c-format +msgid "Unable to save controls, camera is not connected" +msgstr "" + +#: ../src/backend/entangle-camera.c:2164 +#, c-format +msgid "Unable to save controls, camera is not configurable" +msgstr "" + +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 +#, c-format +msgid "Unable to save camera control configuration: %s %d" +msgstr "" + +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 +#, c-format +msgid "Controls not available when camera is disconnected" +msgstr "" + +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 +#, c-format +msgid "Controls not available for this camera" +msgstr "" + +#: ../src/backend/entangle-camera.c:2304 +#, c-format +msgid "Viewfinder control not available with this camera" +msgstr "" + +#: ../src/backend/entangle-camera.c:2317 +#, c-format +msgid "Viewfinder control was not a toggle widget" +msgstr "" + +#: ../src/backend/entangle-camera.c:2324 +#, c-format +msgid "Failed to set viewfinder state: %s %d" +msgstr "" + +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 +#, c-format +msgid "Failed to set manual focus state: %s %d" +msgstr "" + +#: ../src/backend/entangle-camera.c:2442 +#, c-format +msgid "Autofocus control not available with this camera" +msgstr "" + +#: ../src/backend/entangle-camera.c:2455 +#, c-format +msgid "Autofocus control was not a toggle widget" +msgstr "" + +#: ../src/backend/entangle-camera.c:2462 +#, c-format +msgid "Failed to set autofocus state: %s %d" +msgstr "" + +#: ../src/backend/entangle-camera.c:2568 +#, c-format +msgid "Manual focus control not available with this camera" +msgstr "" + +#: ../src/backend/entangle-camera.c:2581 +#, c-format +msgid "Manual focus control was not a range widget" +msgstr "" + +#: ../src/frontend/entangle-camera-info.c:236 +#: ../src/frontend/entangle-camera-manager.c:3023 +#: ../src/frontend/entangle-camera-picker.c:521 +#: ../src/frontend/entangle-camera-support.c:192 +#: ../src/frontend/entangle-help-about.c:114 +#: ../src/frontend/entangle-image-popup.c:242 +#: ../src/frontend/entangle-preferences-display.c:888 +#, c-format +msgid "Could not load user interface definition file: %s" +msgstr "" + +#: ../src/frontend/entangle-camera-info.c:299 +msgid "Unknown information" +msgstr "" + +#: ../src/frontend/entangle-camera-info.c:346 +#, c-format +msgid "%s Camera Info - Entangle" +msgstr "" + +#: ../src/frontend/entangle-camera-info.c:349 +msgid "Camera Info - Entangle" +msgstr "" + +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * tab-width: 8 +#. * End: +#. +#: ../src/frontend/entangle-camera-info.xml.h:1 +#: ../src/frontend/entangle-camera-support.xml.h:1 +msgid "label" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:537 +msgid "This camera does not support image capture" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:542 +msgid "This camera does not support image preview" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:683 +#, c-format +msgid "Operation: %s" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:685 +msgid "Entangle: Operation failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 +msgid "Camera load controls failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 +msgid "Entangle: Camera load controls failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:756 +msgid "Monitor" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 +msgid "Delete" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:928 +msgid "Download" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 +#: ../src/frontend/entangle-camera-manager.xml.h:22 +#: ../src/frontend/entangle-camera-picker.c:533 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 +#: ../src/frontend/entangle-preferences.xml.h:10 +msgid "Capture" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1060 +#: ../src/frontend/entangle-camera-manager.xml.h:24 +msgid "Preview" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1245 +msgid "Camera Manager - Entangle" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 +#, c-format +msgid "Unable to connect to camera: %s" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 +msgid "" +"Check that the camera is not\n" +"\n" +" - opened by another photo application\n" +" - mounted as a filesystem on the desktop\n" +" - in sleep mode to save battery power\n" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 +#: ../src/frontend/entangle-camera-manager.xml.h:27 +msgid "Cancel" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 +msgid "Retry" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1373 +msgid "Camera is in use" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1377 +msgid "" +"The camera cannot be opened because it is currently mounted as a filesystem." +" Do you wish to umount it now ?" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1381 +#: ../src/frontend/entangle-camera-picker.c:125 +msgid "No" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1382 +#: ../src/frontend/entangle-camera-picker.c:125 +msgid "Yes" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1417 +msgid "Camera connect failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1419 +msgid "Entangle: Camera connect failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1455 +#, c-format +msgid "%s Camera Manager - Entangle" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:1808 +#: ../src/frontend/entangle-camera-manager.xml.h:19 +msgid "Select a folder" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:2087 +msgid "Autofocus failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:2089 +msgid "Entangle: Camera autofocus failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:2118 +msgid "Manual focus failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:2120 +msgid "Entangle: Camera manual focus failed" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.c:2849 +msgid "Select application..." +msgstr "" + +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * tab-width: 8 +#. * End: +#. +#: ../src/frontend/entangle-camera-manager.xml.h:1 +msgid "Entangle" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:2 +msgid "_File" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:3 +msgid "Select session" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:4 +msgid "Connect camera" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:5 +msgid "_Edit" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:6 +msgid "_View" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:7 +msgid "Settings" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:8 +msgid "Fullscreen" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:9 +msgid "Presentation" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:10 +msgid "Present on" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:11 +msgid "Windows" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:12 +msgid "New window" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:13 +msgid "Synchronize capture" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:14 +msgid "_Help" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:15 +msgid "Camera" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:16 +msgid "Driver" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:17 +msgid "Manual" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:18 +msgid "Supported Cameras" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:20 +msgid "View the full list of camera settings" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:21 +msgid "Capture an image" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:23 +msgid "Continuous capture preview" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:25 +msgid "" +"Attempt to cancel the currently\n" +"executing camera operation" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:28 +msgid "" +"Shrink the display of the image\n" +"by one factor" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:30 +msgid "Zoom Out" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:31 +msgid "" +"Enlarge the display of the image\n" +"by one factor" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:33 +msgid "Zoom In" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:34 +msgid "" +"Resize the image to automatically\n" +"fit the available window real estate" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:36 +msgid "Best Fit" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:37 +msgid "" +"Display the image with its\n" +"native pixel size" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:39 +msgid "Normal" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:40 +msgid "Switch to fullscreen display mode" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:41 +msgid "Full Screen" +msgstr "" + +#: ../src/frontend/entangle-camera-manager.xml.h:42 +msgid "Open with" +msgstr "" + +#: ../src/frontend/entangle-camera-picker.c:531 +msgid "Model" +msgstr "" + +#: ../src/frontend/entangle-camera-picker.c:532 +msgid "Port" +msgstr "" + +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * tab-width: 8 +#. * End: +#. +#: ../src/frontend/entangle-camera-picker.xml.h:1 +msgid "Select camera - Entangle" +msgstr "" + +#: ../src/frontend/entangle-camera-picker.xml.h:2 +msgid "Select a camera to connect to:" +msgstr "" + +#: ../src/frontend/entangle-camera-picker.xml.h:3 +msgid "" +"No cameras were detected, check that\n" +"\n" +" - the cables are connected\n" +" - the camera is turned on\n" +" - the camera is in the correct mode\n" +" - the camera is a supported model\n" +"\n" +"USB cameras are automatically detected\n" +"when plugged in, for others try a refresh" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:79 +msgid "Camera control update failed" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:81 +msgid "Entangle: Camera control update failed" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:232 +msgid "On" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:232 +msgid "Off" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:559 +msgid "No camera connected" +msgstr "" + +#: ../src/frontend/entangle-control-panel.c:568 +msgid "No controls available" +msgstr "" + +#: ../src/frontend/entangle-dpms.c:57 +msgid "Screen blanking is not available on this display" +msgstr "" + +#: ../src/frontend/entangle-dpms.c:69 +msgid "Screen blanking is not implemented on this platform" +msgstr "" + +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * tab-width: 8 +#. * End: +#. +#: ../src/frontend/entangle-help-about.xml.h:1 +msgid "About - Entangle" +msgstr "" + +#: ../src/frontend/entangle-help-about.xml.h:2 +msgid "Copyright (C) 2009-2012 Daniel P. Berrange" +msgstr "" + +#: ../src/frontend/entangle-help-about.xml.h:3 +msgid "Tethered Camera Control & Capture" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 +msgid "Interface" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 +msgid "Image Viewer" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 +#: ../src/frontend/entangle-preferences.xml.h:18 +msgid "Color Management" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 +#: ../src/frontend/entangle-preferences.xml.h:20 +msgid "Plugins" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1030 +msgid "ICC profiles (*.icc, *.icm)" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1035 +msgid "All files (*.*)" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1061 +msgid "1:1 - Square / MF 6x6" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1066 +msgid "1.15:1 - Movietone" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1071 +msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1076 +msgid "1.37:1 - 35mm movie" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1081 +msgid "1.44:1 - IMAX" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1086 +msgid "1.50:1 (3:2, 15:10)- 35mm SLR" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1091 +msgid "1.6:1 (8:5, 16:10) - Widescreen" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1096 +msgid "1.66:1 (5:3, 15:9) - Super 16mm" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1101 +msgid "1.75:1 (7:4) - Widescreen" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1106 +msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1111 +msgid "1.85:1 - 35mm Widescreen" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1116 +msgid "2.00:1 - SuperScope" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1121 +msgid "2.10:1 (21:10) - Planned HDTV" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1126 +msgid "2.20:1 (11:5, 22:10) - 70mm movie" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1131 +msgid "2.35:1 - CinemaScope" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1136 +msgid "2.37:1 (64:27)- HDTV cinema" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1141 +msgid "2.39:1 (12:5)- Panavision" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1146 +msgid "2.55:1 (23:9)- CinemaScope 55" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1151 +msgid "2.59:1 (13:5)- Cinerama" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1156 +msgid "2.66:1 (8:3, 24:9)- Super 16mm" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1161 +msgid "2.76:1 (11:4) - Ultra Panavision" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1166 +msgid "2.93:1 - MGM Camera 65" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1171 +msgid "3:1 APS Panorama" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1176 +msgid "4.00:1 - Polyvision" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1181 +msgid "12.00:1 - Circle-Vision 360" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1199 +msgid "None" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1204 +msgid "Center lines" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1209 +msgid "Rule of 3rds" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1214 +msgid "Quarters" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1219 +msgid "Rule of 5ths" +msgstr "" + +#: ../src/frontend/entangle-preferences-display.c:1224 +msgid "Golden sections" +msgstr "" + +#. * Local variables: +#. * c-indent-level: 4 +#. * c-basic-offset: 4 +#. * indent-tabs-mode: nil +#. * tab-width: 8 +#. * End: +#. +#: ../src/frontend/entangle-preferences.xml.h:1 +msgid "Perceptual" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:2 +msgid "Relative colourimetric" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:3 +msgid "Saturation" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:4 +msgid "Absolute colourimetric" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:5 +msgid "Entangle Preferences" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:6 +msgid "Capture" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:7 +msgid "Filename pattern:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:8 +msgid "Continue preview mode after capture" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:9 +msgid "Delete file from camera after downloading" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:11 +msgid "Colour management" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:12 +msgid "Mode of operation:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:13 +msgid "RGB profile:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:14 +msgid "Monitor profile:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:15 +msgid "Rendering intent:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:16 +msgid "Detect the system monitor profile" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:17 +msgid "Colour managed display" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:19 +msgid "Plugins" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:21 +msgid "Interface" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:22 +msgid "Automatically connect to cameras at startup" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:23 +msgid "Blank screen when capturing images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:26 +msgid "Image Viewer" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:27 +msgid "Apply mask to alter aspect ratio" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:28 +msgid "Aspect ratio:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:29 +msgid "Mask opacity:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:30 +msgid "Display focus point during preview" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:31 +msgid "Grid lines:" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:32 +msgid "Use embedded preview from raw files" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 +msgid "Overlay layers:" +msgstr "" diff -Nru entangle-0.5.1/po/tr.po entangle-0.5.2/po/tr.po --- entangle-0.5.1/po/tr.po 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/po/tr.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/fedora/language/tr/)\n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/uk.po entangle-0.5.2/po/uk.po --- entangle-0.5.1/po/uk.po 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/po/uk.po 2013-08-17 18:27:47.000000000 +0000 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Yuri Chornoivan , 2012-2013. +# Yuri Chornoivan , 2012-2013 msgid "" msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 21:00+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:57+0000\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "MIME-Version: 1.0\n" @@ -19,193 +19,193 @@ "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" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "Не вдалося ініціалізувати можливості gphoto2" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "Не вдалося завантажити можливості gphoto2" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "Не вдалося ініціалізувати порти gphoto2" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "Не вдалося завантажити порти gphoto2" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "Не вдалося ініціалізувати фотоапарат" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "Захоплення зображень з нез’єднаного фотоапарата не передбачено" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "Не вдалося захопити зображення: %s" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "Попереднього перегляду зображень з нез’єднаного фотоапарата не передбачено" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "Не вдалося захопити зображення попереднього перегляду: %s" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "Не вдалося отримати дані щодо файла: %s" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "Не вдалося отримати назву файла: %s" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "Звантаження файлів з нез’єднаного фотоапарата не передбачено" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "Не вдалося отримати файл з фотоапарата: %s" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "Вилучення файлів з нез’єднаного фотоапарата не передбачено" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "Не вдалося вилучити файл: %s" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "Очікування на події неможливе, якщо фотоапарат не з’єднано" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "Очікування на події неможливе: %s" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "Не вдалося отримати тип віджета" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "Не вдалося отримати назву віджета" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "Не вдалося завантажити засоби керування — фотоапарат не з’єднано з комп’ютером" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "Не вдалося отримати налаштування засобів керування фотоапаратом" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "Не вдалося зберегти налаштування засобів керування фотоапаратом — фотоапарат не з’єднано" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "Не вдалося зберегти налаштування засобів керування фотоапаратом — налаштовування фотоапарата не передбачено" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "Не вдалося зберегти налаштування засобів керування фотоапаратом: %s %d" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "Для цього фотоапарата не передбачено засобів керування" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "Не вдалося отримати доступ до засобів керування цим фотоапаратом" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "Керування видошукачем для цього фотоапарата не передбачено" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "Віджет керування видошукачем не можна вмикати або вимикати" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "Не вдалося встановити стан видошукача: %s %d" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "Не вдалося встановити стан фокусування вручну: %s %d" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "Керування автофокусуванням для цього фотоапарата не передбачено" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "Віджет керування автофокусуванням не можна вмикати або вимикати" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "Не вдалося встановити стан автофокусування: %s %d" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "Керування фокусуванням вручну для цього фотоапарата не передбачено" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "Віджет керування фокусуванням вручну не є віджетом діапазону значень" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "Не вдалося завантажити файл визначень інтерфейсу користувача: %s" @@ -235,74 +235,74 @@ msgid "label" msgstr "мітка" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "Для цього фотоапарата не передбачено захоплення зображень" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "Для цього фотоапарата не передбачено попереднього перегляду знімків" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "Дія: %s" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "Entangle: помилка дії" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "Помилка завантаження засобів керування фотоапаратом" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "Entangle: не вдалося завантажити засоби керування фотоапаратом" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "Монітор" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "Вилучити" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "Звантажити" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "Захопити" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "Перегляд" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "Керування фотоапаратами — Entangle" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "Не вдалося встановити з’єднання з фотоапаратом: %s" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -311,72 +311,72 @@ " - in sleep mode to save battery power\n" msgstr "Переконайтеся, що виконуються такі умови:\n\n - з фотоапаратом не працює ніяка стороння програма;\n - фотоапарат не змонтовано як файлову систему стільничним середовищем;\n - фотоапарат не перебуває у режимі сну, призначеному для економії заряду акумуляторів.\n" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "Скасувати" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "Повторити" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "Фотоапарат використовується" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "Робота з фотоапаратом неможлива, оскільки зараз його змонтовано як сховище даних. Демонтувати відповідне сховище даних?" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "Ні" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "Так" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "Помилка з’єднання з фотоапаратом" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "Entangle: не вдалося встановити з’єднання з фотоапаратом" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "Керування фотоапаратами %s — Entangle" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "Виберіть теку" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "Спроба автофокусування зазнала невдачі" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "Entangle: спроба автоматично встановити фокус фотоапарата зазнала невдачі" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "Спроба фокусування вручну зазнала невдачі" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "Entangle: не вдалося встановити на фотоапараті фокусування вручну" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "Виберіть програму…" @@ -573,19 +573,19 @@ msgid "Entangle: Camera control update failed" msgstr "Entangle: спроба оновлення списку керування фотоапаратами зазнала невдачі" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "Увімкнено" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "Вимкнено" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "Не з’єднано жодного фотоапарата" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "Немає доступу до засобів керування" @@ -616,159 +616,159 @@ msgid "Tethered Camera Control & Capture" msgstr "Керування фотоапаратами та захоплення даних зі з’єднаних фотоапаратів" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "Інтерфейс" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "Перегляд зображень" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "Керування кольорами" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "Додатки" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "профілі ICC (*.icc, *.icm)" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "всі файли (*.*)" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "1:1 — квадратне / MF 6x6" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "1.15:1 — Movietone" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "1,33:1 (4:3, 12:9) — супер 35 мм / DSLR / MF 645" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "1.37:1 — 35 мм відео" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "1.44:1 — IMAX" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "1.50:1 (3:2, 15:10) — 35 мм відеозапис" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "1.6:1 (8:5, 16:10) — широкий екран" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "1,66:1 (5:3, 15:9) — супер 16 мм" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "1,75:1 (7:4) — широкий екран" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "1,77:1 (16:9) — APS-H / HDTV / широкоекранне" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "1,85:1 — широкоекранний, 35 мм" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "2,00:1 — SuperScope" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "2,10:1 (21:10) —плановане телебачення високої роздільності" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "2,20:1 (11:5, 22:10) — 70 мм відео" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "2,35:1 — CinemaScope" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "2,37:1 (64:27) — телебачення високої роздільності" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "2,39:1 (12:5) — Panavision" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "2,55:1 (23:9) — CinemaScope 55" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "2,59:1 (13:5) — Cinerama" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "2,66:1 (8:3, 24:9) — супер 16 мм" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "2,76:1 (11:4) — Ultra Panavision" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "2,93:1 — камера MGM 65" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "3:1 панорама APS" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "4.00:1 — Polyvision" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "12.00:1 — кругове бачення 360" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "Немає" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "Центрувати рядки" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "Правило третіх" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "Чверті" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "Правило п’ятих" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "Золоті перетини" @@ -859,38 +859,42 @@ msgid "Blank screen when capturing images" msgstr "Спорожняти екран під час захоплення зображень" -#: ../src/frontend/entangle-preferences.xml.h:25 +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" +msgstr "Показати лінійну гістограму" + +#: ../src/frontend/entangle-preferences.xml.h:26 msgid "Image Viewer" msgstr "Перегляд зображень" -#: ../src/frontend/entangle-preferences.xml.h:26 +#: ../src/frontend/entangle-preferences.xml.h:27 msgid "Apply mask to alter aspect ratio" msgstr "Застосувати маску з метою зміни форм-фактора" -#: ../src/frontend/entangle-preferences.xml.h:27 +#: ../src/frontend/entangle-preferences.xml.h:28 msgid "Aspect ratio:" msgstr "Форм-фактор:" -#: ../src/frontend/entangle-preferences.xml.h:28 +#: ../src/frontend/entangle-preferences.xml.h:29 msgid "Mask opacity:" msgstr "Непрозорість маски:" -#: ../src/frontend/entangle-preferences.xml.h:29 +#: ../src/frontend/entangle-preferences.xml.h:30 msgid "Display focus point during preview" msgstr "Показувати точку фокусування під час перегляду" -#: ../src/frontend/entangle-preferences.xml.h:30 +#: ../src/frontend/entangle-preferences.xml.h:31 msgid "Grid lines:" msgstr "Лінії сітки:" -#: ../src/frontend/entangle-preferences.xml.h:31 +#: ../src/frontend/entangle-preferences.xml.h:32 msgid "Use embedded preview from raw files" msgstr "Вбудовані мініатюри з файлів цифрових негативів" -#: ../src/frontend/entangle-preferences.xml.h:32 +#: ../src/frontend/entangle-preferences.xml.h:33 msgid "Overlay earlier images" msgstr "Накладати попередні зображення" -#: ../src/frontend/entangle-preferences.xml.h:33 +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "Шари накладання" diff -Nru entangle-0.5.1/po/vi.po entangle-0.5.2/po/vi.po --- entangle-0.5.1/po/vi.po 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/po/vi.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/fedora/language/vi/)\n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=1; plural=0;\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/zh_CN.po entangle-0.5.2/po/zh_CN.po --- entangle-0.5.1/po/zh_CN.po 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/po/zh_CN.po 2013-08-17 18:27:47.000000000 +0000 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# , 2012. +# Tiansworld , 2012 msgid "" msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Chinese (China) \n" "MIME-Version: 1.0\n" @@ -19,193 +19,193 @@ "Plural-Forms: nplurals=1; plural=0;\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -235,74 +235,74 @@ msgid "label" msgstr "标签" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "捕捉" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "预览" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -311,72 +311,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "取消" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -573,19 +573,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -616,159 +616,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "色彩管理" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -859,38 +859,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/zh_HK.po entangle-0.5.2/po/zh_HK.po --- entangle-0.5.1/po/zh_HK.po 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/po/zh_HK.po 2013-08-17 18:27:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Chinese (Hong Kong) \n" "MIME-Version: 1.0\n" @@ -18,193 +18,193 @@ "Plural-Forms: nplurals=1; plural=0;\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -234,74 +234,74 @@ msgid "label" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -310,72 +310,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -572,19 +572,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -615,159 +615,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -858,38 +858,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/po/zh_TW.po entangle-0.5.2/po/zh_TW.po --- entangle-0.5.1/po/zh_TW.po 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/po/zh_TW.po 2013-08-17 18:27:47.000000000 +0000 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Walter Cheuk , 2012. +# Walter Cheuk , 2012 msgid "" msgstr "" "Project-Id-Version: Entangle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 20:12+0000\n" -"PO-Revision-Date: 2013-03-02 20:13+0000\n" +"POT-Creation-Date: 2013-08-17 18:57+0100\n" +"PO-Revision-Date: 2013-04-24 18:44+0000\n" "Last-Translator: Daniel Berrange \n" "Language-Team: Chinese (Taiwan) \n" "MIME-Version: 1.0\n" @@ -19,193 +19,193 @@ "Plural-Forms: nplurals=1; plural=0;\n" #: ../src/backend/entangle-camera-list.c:218 -#: ../src/backend/entangle-camera.c:692 +#: ../src/backend/entangle-camera.c:746 #, c-format msgid "Cannot initialize gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:221 -#: ../src/backend/entangle-camera.c:698 +#: ../src/backend/entangle-camera.c:752 #, c-format msgid "Cannot load gphoto2 abilities" msgstr "" #: ../src/backend/entangle-camera-list.c:224 -#: ../src/backend/entangle-camera.c:704 +#: ../src/backend/entangle-camera.c:758 #, c-format msgid "Cannot initialize gphoto2 ports" msgstr "" #: ../src/backend/entangle-camera-list.c:227 -#: ../src/backend/entangle-camera.c:710 +#: ../src/backend/entangle-camera.c:764 #, c-format msgid "Cannot load gphoto2 ports" msgstr "" -#: ../src/backend/entangle-camera.c:741 +#: ../src/backend/entangle-camera.c:795 #, c-format msgid "Unable to initialize camera" msgstr "" -#: ../src/backend/entangle-camera.c:1000 +#: ../src/backend/entangle-camera.c:1054 msgid "Cannot capture image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1013 +#: ../src/backend/entangle-camera.c:1067 #, c-format msgid "Unable to capture image: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1099 +#: ../src/backend/entangle-camera.c:1153 msgid "Cannot preview image while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1114 +#: ../src/backend/entangle-camera.c:1168 #, c-format msgid "Unable to capture preview: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1120 ../src/backend/entangle-camera.c:1249 +#: ../src/backend/entangle-camera.c:1174 ../src/backend/entangle-camera.c:1303 #, c-format msgid "Unable to get file data: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1125 +#: ../src/backend/entangle-camera.c:1179 #, c-format msgid "Unable to get filename: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1221 +#: ../src/backend/entangle-camera.c:1275 msgid "Cannot download file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1243 +#: ../src/backend/entangle-camera.c:1297 #, c-format msgid "Unable to get camera file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1338 +#: ../src/backend/entangle-camera.c:1392 msgid "Cannot delete file while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1355 +#: ../src/backend/entangle-camera.c:1409 #, c-format msgid "Unable to delete file: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1437 +#: ../src/backend/entangle-camera.c:1491 msgid "Cannot wait for events while not connected" msgstr "" -#: ../src/backend/entangle-camera.c:1463 +#: ../src/backend/entangle-camera.c:1517 #, c-format msgid "Unable to wait for events: %s" msgstr "" -#: ../src/backend/entangle-camera.c:1636 ../src/backend/entangle-camera.c:1798 -#: ../src/backend/entangle-camera.c:1907 ../src/backend/entangle-camera.c:2257 -#: ../src/backend/entangle-camera.c:2395 ../src/backend/entangle-camera.c:2521 +#: ../src/backend/entangle-camera.c:1690 ../src/backend/entangle-camera.c:1852 +#: ../src/backend/entangle-camera.c:1961 ../src/backend/entangle-camera.c:2311 +#: ../src/backend/entangle-camera.c:2449 ../src/backend/entangle-camera.c:2575 #, c-format msgid "Unable to fetch widget type" msgstr "" -#: ../src/backend/entangle-camera.c:1642 ../src/backend/entangle-camera.c:1804 -#: ../src/backend/entangle-camera.c:1913 +#: ../src/backend/entangle-camera.c:1696 ../src/backend/entangle-camera.c:1858 +#: ../src/backend/entangle-camera.c:1967 #, c-format msgid "Unable to fetch widget name" msgstr "" -#: ../src/backend/entangle-camera.c:2009 +#: ../src/backend/entangle-camera.c:2063 #, c-format msgid "Unable to load controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2017 +#: ../src/backend/entangle-camera.c:2071 #, c-format msgid "Unable to fetch camera control configuration" msgstr "" -#: ../src/backend/entangle-camera.c:2104 +#: ../src/backend/entangle-camera.c:2158 #, c-format msgid "Unable to save controls, camera is not connected" msgstr "" -#: ../src/backend/entangle-camera.c:2110 +#: ../src/backend/entangle-camera.c:2164 #, c-format msgid "Unable to save controls, camera is not configurable" msgstr "" -#: ../src/backend/entangle-camera.c:2121 ../src/backend/entangle-camera.c:2285 -#: ../src/backend/entangle-camera.c:2423 ../src/backend/entangle-camera.c:2549 +#: ../src/backend/entangle-camera.c:2175 ../src/backend/entangle-camera.c:2339 +#: ../src/backend/entangle-camera.c:2477 ../src/backend/entangle-camera.c:2603 #, c-format msgid "Unable to save camera control configuration: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2196 ../src/backend/entangle-camera.c:2233 -#: ../src/backend/entangle-camera.c:2374 ../src/backend/entangle-camera.c:2500 +#: ../src/backend/entangle-camera.c:2250 ../src/backend/entangle-camera.c:2287 +#: ../src/backend/entangle-camera.c:2428 ../src/backend/entangle-camera.c:2554 #, c-format msgid "Controls not available when camera is disconnected" msgstr "" -#: ../src/backend/entangle-camera.c:2202 ../src/backend/entangle-camera.c:2239 -#: ../src/backend/entangle-camera.c:2380 ../src/backend/entangle-camera.c:2506 +#: ../src/backend/entangle-camera.c:2256 ../src/backend/entangle-camera.c:2293 +#: ../src/backend/entangle-camera.c:2434 ../src/backend/entangle-camera.c:2560 #, c-format msgid "Controls not available for this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2250 +#: ../src/backend/entangle-camera.c:2304 #, c-format msgid "Viewfinder control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2263 +#: ../src/backend/entangle-camera.c:2317 #, c-format msgid "Viewfinder control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2270 +#: ../src/backend/entangle-camera.c:2324 #, c-format msgid "Failed to set viewfinder state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2276 ../src/backend/entangle-camera.c:2414 -#: ../src/backend/entangle-camera.c:2534 ../src/backend/entangle-camera.c:2540 +#: ../src/backend/entangle-camera.c:2330 ../src/backend/entangle-camera.c:2468 +#: ../src/backend/entangle-camera.c:2588 ../src/backend/entangle-camera.c:2594 #, c-format msgid "Failed to set manual focus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2388 +#: ../src/backend/entangle-camera.c:2442 #, c-format msgid "Autofocus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2401 +#: ../src/backend/entangle-camera.c:2455 #, c-format msgid "Autofocus control was not a toggle widget" msgstr "" -#: ../src/backend/entangle-camera.c:2408 +#: ../src/backend/entangle-camera.c:2462 #, c-format msgid "Failed to set autofocus state: %s %d" msgstr "" -#: ../src/backend/entangle-camera.c:2514 +#: ../src/backend/entangle-camera.c:2568 #, c-format msgid "Manual focus control not available with this camera" msgstr "" -#: ../src/backend/entangle-camera.c:2527 +#: ../src/backend/entangle-camera.c:2581 #, c-format msgid "Manual focus control was not a range widget" msgstr "" #: ../src/frontend/entangle-camera-info.c:236 -#: ../src/frontend/entangle-camera-manager.c:3013 +#: ../src/frontend/entangle-camera-manager.c:3023 #: ../src/frontend/entangle-camera-picker.c:521 #: ../src/frontend/entangle-camera-support.c:192 #: ../src/frontend/entangle-help-about.c:114 #: ../src/frontend/entangle-image-popup.c:242 -#: ../src/frontend/entangle-preferences-display.c:863 +#: ../src/frontend/entangle-preferences-display.c:888 #, c-format msgid "Could not load user interface definition file: %s" msgstr "" @@ -235,74 +235,74 @@ msgid "label" msgstr "標籤" -#: ../src/frontend/entangle-camera-manager.c:518 +#: ../src/frontend/entangle-camera-manager.c:537 msgid "This camera does not support image capture" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:523 +#: ../src/frontend/entangle-camera-manager.c:542 msgid "This camera does not support image preview" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:631 +#: ../src/frontend/entangle-camera-manager.c:683 #, c-format msgid "Operation: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:633 +#: ../src/frontend/entangle-camera-manager.c:685 msgid "Entangle: Operation failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:666 -#: ../src/frontend/entangle-camera-manager.c:1264 +#: ../src/frontend/entangle-camera-manager.c:716 +#: ../src/frontend/entangle-camera-manager.c:1290 msgid "Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:668 -#: ../src/frontend/entangle-camera-manager.c:1266 +#: ../src/frontend/entangle-camera-manager.c:718 +#: ../src/frontend/entangle-camera-manager.c:1292 msgid "Entangle: Camera load controls failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:707 +#: ../src/frontend/entangle-camera-manager.c:756 msgid "Monitor" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:865 -#: ../src/frontend/entangle-camera-manager.c:2699 +#: ../src/frontend/entangle-camera-manager.c:908 +#: ../src/frontend/entangle-camera-manager.c:2720 msgid "Delete" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:885 +#: ../src/frontend/entangle-camera-manager.c:928 msgid "Download" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:916 -#: ../src/frontend/entangle-camera-manager.c:954 -#: ../src/frontend/entangle-camera-manager.c:982 +#: ../src/frontend/entangle-camera-manager.c:959 +#: ../src/frontend/entangle-camera-manager.c:997 +#: ../src/frontend/entangle-camera-manager.c:1025 #: ../src/frontend/entangle-camera-manager.xml.h:22 #: ../src/frontend/entangle-camera-picker.c:533 -#: ../src/frontend/entangle-preferences-display.c:950 -#: ../src/frontend/entangle-preferences-display.c:956 +#: ../src/frontend/entangle-preferences-display.c:975 +#: ../src/frontend/entangle-preferences-display.c:981 #: ../src/frontend/entangle-preferences.xml.h:10 msgid "Capture" msgstr "擷取" -#: ../src/frontend/entangle-camera-manager.c:1017 +#: ../src/frontend/entangle-camera-manager.c:1060 #: ../src/frontend/entangle-camera-manager.xml.h:24 msgid "Preview" msgstr "預覽" -#: ../src/frontend/entangle-camera-manager.c:1216 +#: ../src/frontend/entangle-camera-manager.c:1245 msgid "Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1308 -#: ../src/frontend/entangle-camera-manager.c:2554 +#: ../src/frontend/entangle-camera-manager.c:1332 +#: ../src/frontend/entangle-camera-manager.c:2575 #, c-format msgid "Unable to connect to camera: %s" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1313 -#: ../src/frontend/entangle-camera-manager.c:2560 +#: ../src/frontend/entangle-camera-manager.c:1337 +#: ../src/frontend/entangle-camera-manager.c:2581 msgid "" "Check that the camera is not\n" "\n" @@ -311,72 +311,72 @@ " - in sleep mode to save battery power\n" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1318 -#: ../src/frontend/entangle-camera-manager.c:2565 +#: ../src/frontend/entangle-camera-manager.c:1342 +#: ../src/frontend/entangle-camera-manager.c:2586 #: ../src/frontend/entangle-camera-manager.xml.h:27 msgid "Cancel" msgstr "取消" -#: ../src/frontend/entangle-camera-manager.c:1319 -#: ../src/frontend/entangle-camera-manager.c:2566 +#: ../src/frontend/entangle-camera-manager.c:1343 +#: ../src/frontend/entangle-camera-manager.c:2587 msgid "Retry" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1350 +#: ../src/frontend/entangle-camera-manager.c:1373 msgid "Camera is in use" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1354 +#: ../src/frontend/entangle-camera-manager.c:1377 msgid "" "The camera cannot be opened because it is currently mounted as a filesystem." " Do you wish to umount it now ?" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1358 +#: ../src/frontend/entangle-camera-manager.c:1381 #: ../src/frontend/entangle-camera-picker.c:125 msgid "No" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1359 +#: ../src/frontend/entangle-camera-manager.c:1382 #: ../src/frontend/entangle-camera-picker.c:125 msgid "Yes" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1395 +#: ../src/frontend/entangle-camera-manager.c:1417 msgid "Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1397 +#: ../src/frontend/entangle-camera-manager.c:1419 msgid "Entangle: Camera connect failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1436 +#: ../src/frontend/entangle-camera-manager.c:1455 #, c-format msgid "%s Camera Manager - Entangle" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:1789 +#: ../src/frontend/entangle-camera-manager.c:1808 #: ../src/frontend/entangle-camera-manager.xml.h:19 msgid "Select a folder" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2069 +#: ../src/frontend/entangle-camera-manager.c:2087 msgid "Autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2071 +#: ../src/frontend/entangle-camera-manager.c:2089 msgid "Entangle: Camera autofocus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2102 +#: ../src/frontend/entangle-camera-manager.c:2118 msgid "Manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2104 +#: ../src/frontend/entangle-camera-manager.c:2120 msgid "Entangle: Camera manual focus failed" msgstr "" -#: ../src/frontend/entangle-camera-manager.c:2828 +#: ../src/frontend/entangle-camera-manager.c:2849 msgid "Select application..." msgstr "" @@ -573,19 +573,19 @@ msgid "Entangle: Camera control update failed" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "On" msgstr "" -#: ../src/frontend/entangle-control-panel.c:244 +#: ../src/frontend/entangle-control-panel.c:232 msgid "Off" msgstr "" -#: ../src/frontend/entangle-control-panel.c:566 +#: ../src/frontend/entangle-control-panel.c:559 msgid "No camera connected" msgstr "" -#: ../src/frontend/entangle-control-panel.c:575 +#: ../src/frontend/entangle-control-panel.c:568 msgid "No controls available" msgstr "" @@ -616,159 +616,159 @@ msgid "Tethered Camera Control & Capture" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:922 -#: ../src/frontend/entangle-preferences-display.c:928 -#: ../src/frontend/entangle-preferences.xml.h:24 +#: ../src/frontend/entangle-preferences-display.c:947 +#: ../src/frontend/entangle-preferences-display.c:953 +#: ../src/frontend/entangle-preferences.xml.h:25 msgid "Interface" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:936 -#: ../src/frontend/entangle-preferences-display.c:942 -#: ../src/frontend/entangle-preferences.xml.h:34 +#: ../src/frontend/entangle-preferences-display.c:961 +#: ../src/frontend/entangle-preferences-display.c:967 +#: ../src/frontend/entangle-preferences.xml.h:35 msgid "Image Viewer" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:964 -#: ../src/frontend/entangle-preferences-display.c:970 +#: ../src/frontend/entangle-preferences-display.c:989 +#: ../src/frontend/entangle-preferences-display.c:995 #: ../src/frontend/entangle-preferences.xml.h:18 msgid "Color Management" msgstr "色彩管理" -#: ../src/frontend/entangle-preferences-display.c:978 -#: ../src/frontend/entangle-preferences-display.c:984 +#: ../src/frontend/entangle-preferences-display.c:1003 +#: ../src/frontend/entangle-preferences-display.c:1009 #: ../src/frontend/entangle-preferences.xml.h:20 msgid "Plugins" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1005 +#: ../src/frontend/entangle-preferences-display.c:1030 msgid "ICC profiles (*.icc, *.icm)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1010 +#: ../src/frontend/entangle-preferences-display.c:1035 msgid "All files (*.*)" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1036 +#: ../src/frontend/entangle-preferences-display.c:1061 msgid "1:1 - Square / MF 6x6" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1041 +#: ../src/frontend/entangle-preferences-display.c:1066 msgid "1.15:1 - Movietone" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1046 +#: ../src/frontend/entangle-preferences-display.c:1071 msgid "1.33:1 (4:3, 12:9) - Super 35mm / DSLR / MF 645" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1051 +#: ../src/frontend/entangle-preferences-display.c:1076 msgid "1.37:1 - 35mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1056 +#: ../src/frontend/entangle-preferences-display.c:1081 msgid "1.44:1 - IMAX" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1061 +#: ../src/frontend/entangle-preferences-display.c:1086 msgid "1.50:1 (3:2, 15:10)- 35mm SLR" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1066 +#: ../src/frontend/entangle-preferences-display.c:1091 msgid "1.6:1 (8:5, 16:10) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1071 +#: ../src/frontend/entangle-preferences-display.c:1096 msgid "1.66:1 (5:3, 15:9) - Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1076 +#: ../src/frontend/entangle-preferences-display.c:1101 msgid "1.75:1 (7:4) - Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1081 +#: ../src/frontend/entangle-preferences-display.c:1106 msgid "1.77:1 (16:9) - APS-H / HDTV / Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1086 +#: ../src/frontend/entangle-preferences-display.c:1111 msgid "1.85:1 - 35mm Widescreen" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1091 +#: ../src/frontend/entangle-preferences-display.c:1116 msgid "2.00:1 - SuperScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1096 +#: ../src/frontend/entangle-preferences-display.c:1121 msgid "2.10:1 (21:10) - Planned HDTV" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1101 +#: ../src/frontend/entangle-preferences-display.c:1126 msgid "2.20:1 (11:5, 22:10) - 70mm movie" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1106 +#: ../src/frontend/entangle-preferences-display.c:1131 msgid "2.35:1 - CinemaScope" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1111 +#: ../src/frontend/entangle-preferences-display.c:1136 msgid "2.37:1 (64:27)- HDTV cinema" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1116 +#: ../src/frontend/entangle-preferences-display.c:1141 msgid "2.39:1 (12:5)- Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1121 +#: ../src/frontend/entangle-preferences-display.c:1146 msgid "2.55:1 (23:9)- CinemaScope 55" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1126 +#: ../src/frontend/entangle-preferences-display.c:1151 msgid "2.59:1 (13:5)- Cinerama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1131 +#: ../src/frontend/entangle-preferences-display.c:1156 msgid "2.66:1 (8:3, 24:9)- Super 16mm" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1136 +#: ../src/frontend/entangle-preferences-display.c:1161 msgid "2.76:1 (11:4) - Ultra Panavision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1141 +#: ../src/frontend/entangle-preferences-display.c:1166 msgid "2.93:1 - MGM Camera 65" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1146 +#: ../src/frontend/entangle-preferences-display.c:1171 msgid "3:1 APS Panorama" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1151 +#: ../src/frontend/entangle-preferences-display.c:1176 msgid "4.00:1 - Polyvision" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1156 +#: ../src/frontend/entangle-preferences-display.c:1181 msgid "12.00:1 - Circle-Vision 360" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1174 +#: ../src/frontend/entangle-preferences-display.c:1199 msgid "None" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1179 +#: ../src/frontend/entangle-preferences-display.c:1204 msgid "Center lines" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1184 +#: ../src/frontend/entangle-preferences-display.c:1209 msgid "Rule of 3rds" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1189 +#: ../src/frontend/entangle-preferences-display.c:1214 msgid "Quarters" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1194 +#: ../src/frontend/entangle-preferences-display.c:1219 msgid "Rule of 5ths" msgstr "" -#: ../src/frontend/entangle-preferences-display.c:1199 +#: ../src/frontend/entangle-preferences-display.c:1224 msgid "Golden sections" msgstr "" @@ -859,38 +859,42 @@ msgid "Blank screen when capturing images" msgstr "" -#: ../src/frontend/entangle-preferences.xml.h:25 -msgid "Image Viewer" +#: ../src/frontend/entangle-preferences.xml.h:24 +msgid "Show linear histogram" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:26 -msgid "Apply mask to alter aspect ratio" +msgid "Image Viewer" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:27 -msgid "Aspect ratio:" +msgid "Apply mask to alter aspect ratio" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:28 -msgid "Mask opacity:" +msgid "Aspect ratio:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:29 -msgid "Display focus point during preview" +msgid "Mask opacity:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:30 -msgid "Grid lines:" +msgid "Display focus point during preview" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:31 -msgid "Use embedded preview from raw files" +msgid "Grid lines:" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:32 -msgid "Overlay earlier images" +msgid "Use embedded preview from raw files" msgstr "" #: ../src/frontend/entangle-preferences.xml.h:33 +msgid "Overlay earlier images" +msgstr "" + +#: ../src/frontend/entangle-preferences.xml.h:34 msgid "Overlay layers:" msgstr "" diff -Nru entangle-0.5.1/src/Makefile.in entangle-0.5.2/src/Makefile.in --- entangle-0.5.1/src/Makefile.in 2013-03-12 21:24:38.000000000 +0000 +++ entangle-0.5.2/src/Makefile.in 2013-08-17 18:27:59.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 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, @@ -17,23 +17,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,7 +82,7 @@ host_triplet = @host@ bin_PROGRAMS = entangle$(EXEEXT) subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/entangle-compile-warnings.m4 \ @@ -180,13 +208,14 @@ $(libentangle_frontend_la_SOURCES) $(entangle_SOURCES) DIST_SOURCES = $(libentangle_backend_la_SOURCES) \ $(libentangle_frontend_la_SOURCES) $(entangle_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;; \ @@ -223,9 +252,29 @@ $(icc_DATA) $(icon_DATA) $(typelibs_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) @@ -670,8 +719,10 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libentangle_backend.la: $(libentangle_backend_la_OBJECTS) $(libentangle_backend_la_DEPENDENCIES) $(EXTRA_libentangle_backend_la_DEPENDENCIES) $(AM_V_CCLD)$(libentangle_backend_la_LINK) $(libentangle_backend_la_OBJECTS) $(libentangle_backend_la_LIBADD) $(LIBS) + libentangle_frontend.la: $(libentangle_frontend_la_OBJECTS) $(libentangle_frontend_la_DEPENDENCIES) $(EXTRA_libentangle_frontend_la_DEPENDENCIES) $(AM_V_CCLD)$(libentangle_frontend_la_LINK) $(libentangle_frontend_la_OBJECTS) $(libentangle_frontend_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @@ -683,10 +734,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -707,7 +760,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -720,6 +774,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + entangle$(EXEEXT): $(entangle_OBJECTS) $(entangle_DEPENDENCIES) $(EXTRA_entangle_DEPENDENCIES) @rm -f entangle$(EXEEXT) $(AM_V_CCLD)$(entangle_LINK) $(entangle_OBJECTS) $(entangle_LDADD) $(LIBS) @@ -1254,14 +1309,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 \ @@ -1282,31 +1336,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 \ @@ -1322,12 +1358,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; \ @@ -1339,15 +1370,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 @@ -1356,9 +1383,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) ;; \ @@ -1549,14 +1577,12 @@ uninstall-local uninstall-typelibsDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ - cscopelist-recursive ctags-recursive install 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-binPROGRAMS \ - clean-generic clean-libtool clean-noinstLTLIBRARIES cscopelist \ - cscopelist-recursive ctags ctags-recursive distclean \ +.MAKE: $(am__recursive_targets) all check install install-am \ + install-data-am install-strip uninstall-am + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-binPROGRAMS 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-binPROGRAMS install-builderDATA \ @@ -1570,9 +1596,8 @@ 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-binPROGRAMS uninstall-builderDATA \ - uninstall-desktopDATA uninstall-girDATA \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-builderDATA uninstall-desktopDATA uninstall-girDATA \ uninstall-gsettingsDATA uninstall-hook uninstall-iccDATA \ uninstall-iconDATA uninstall-local uninstall-typelibsDATA diff -Nru entangle-0.5.1/src/backend/entangle-camera.c entangle-0.5.2/src/backend/entangle-camera.c --- entangle-0.5.1/src/backend/entangle-camera.c 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/backend/entangle-camera.c 2013-08-17 18:27:47.000000000 +0000 @@ -569,18 +569,66 @@ return priv->port; } +struct EntangleCameraProgressData { + EntangleCamera *cam; + enum { + ENTANGLE_CAMERA_PROGRESS_START, + ENTANGLE_CAMERA_PROGRESS_UPDATE, + ENTANGLE_CAMERA_PROGRESS_STOP + } op; + float value; + char *msg; +}; + +static gboolean entangle_camera_progress_idle(gpointer opaque) +{ + struct EntangleCameraProgressData *data = opaque; + + if (data->cam->priv->progress) { + switch (data->op) { + case ENTANGLE_CAMERA_PROGRESS_START: + entangle_progress_start(data->cam->priv->progress, + data->value, + data->msg); + break; + + case ENTANGLE_CAMERA_PROGRESS_UPDATE: + entangle_progress_update(data->cam->priv->progress, + data->value); + break; + + case ENTANGLE_CAMERA_PROGRESS_STOP: + entangle_progress_stop(data->cam->priv->progress); + break; + + default: + break; + } + } + + if (data->op == ENTANGLE_CAMERA_PROGRESS_START) + g_free(data->msg); + g_object_unref(data->cam); + g_free(data); + + return FALSE; +} #ifdef HAVE_GPHOTO25 static unsigned int do_entangle_camera_progress_start(GPContext *ctx G_GNUC_UNUSED, float target, const char *msg, - void *data) + void *opaque) { - EntangleCamera *cam = data; - EntangleCameraPrivate *priv = cam->priv; + EntangleCamera *cam = opaque; + struct EntangleCameraProgressData *data = g_new0(struct EntangleCameraProgressData, 1); - if (priv->progress) - entangle_progress_start(priv->progress, target, msg); + data->cam = g_object_ref(cam); + data->op = ENTANGLE_CAMERA_PROGRESS_START; + data->value = target; + data->msg = g_strdup(msg); + + g_idle_add(entangle_camera_progress_idle, data); return 0; /* XXX what is this actually useful for ? */ } @@ -589,16 +637,17 @@ float target, const char *format, va_list args, - void *data) + void *opaque) { - EntangleCamera *cam = data; - EntangleCameraPrivate *priv = cam->priv; + EntangleCamera *cam = opaque; + struct EntangleCameraProgressData *data = g_new0(struct EntangleCameraProgressData, 1); - if (priv->progress) { - char *str = g_strdup_vprintf(format, args); - entangle_progress_start(priv->progress, target, str); - g_free(str); - } + data->cam = g_object_ref(cam); + data->op = ENTANGLE_CAMERA_PROGRESS_START; + data->value = target; + data->msg = g_strdup_vprintf(format, args); + + g_idle_add(entangle_camera_progress_idle, data); return 0; /* XXX what is this actually useful for ? */ } @@ -607,24 +656,29 @@ static void do_entangle_camera_progress_update(GPContext *ctx G_GNUC_UNUSED, unsigned int id G_GNUC_UNUSED, float current, - void *data) + void *opaque) { - EntangleCamera *cam = data; - EntangleCameraPrivate *priv = cam->priv; + EntangleCamera *cam = opaque; + struct EntangleCameraProgressData *data = g_new0(struct EntangleCameraProgressData, 1); - if (priv->progress) - entangle_progress_update(priv->progress, current); + data->cam = g_object_ref(cam); + data->op = ENTANGLE_CAMERA_PROGRESS_UPDATE; + data->value = current; + + g_idle_add(entangle_camera_progress_idle, data); } static void do_entangle_camera_progress_stop(GPContext *ctx G_GNUC_UNUSED, unsigned int id G_GNUC_UNUSED, - void *data) + void *opaque) { - EntangleCamera *cam = data; - EntangleCameraPrivate *priv = cam->priv; + EntangleCamera *cam = opaque; + struct EntangleCameraProgressData *data = g_new0(struct EntangleCameraProgressData, 1); - if (priv->progress) - entangle_progress_stop(priv->progress); + data->cam = g_object_ref(cam); + data->op = ENTANGLE_CAMERA_PROGRESS_STOP; + + g_idle_add(entangle_camera_progress_idle, data); } static void entangle_camera_reset_last_error(EntangleCamera *cam) @@ -869,7 +923,7 @@ gp_camera_unref(priv->cam); priv->cam = NULL; priv->hasViewfinder = FALSE; - + priv->hasCapture = priv->hasPreview = priv->hasSettings = FALSE; ret = TRUE; @@ -2277,7 +2331,7 @@ gp_port_result_as_string(err), err); goto cleanup; } - + if ((err = gp_camera_set_config(priv->cam, priv->widgets, priv->ctx)) != GP_OK) { @@ -2415,7 +2469,7 @@ gp_port_result_as_string(err), err); goto cleanup; } - + if ((err = gp_camera_set_config(priv->cam, priv->widgets, priv->ctx)) != GP_OK) { @@ -2541,7 +2595,7 @@ gp_port_result_as_string(err), err); goto cleanup; } - + if ((err = gp_camera_set_config(priv->cam, priv->widgets, priv->ctx)) != GP_OK) { @@ -2747,16 +2801,14 @@ * CPU burn loop in a bg thread from DBus messages. So we * have made this static for now */ -static GStaticMutex monitorLock = G_STATIC_MUTEX_INIT; -static GVolumeMonitor *monitor; gboolean entangle_camera_is_mounted(EntangleCamera *cam) { g_return_val_if_fail(ENTANGLE_IS_CAMERA(cam), FALSE); + static GVolumeMonitor *monitor; GMount *mount; gboolean ret; - g_static_mutex_lock(&monitorLock); if (!monitor) monitor = g_volume_monitor_get(); mount = entangle_device_manager_find_mount(cam, monitor); @@ -2767,7 +2819,6 @@ } else { ret = FALSE; } - g_static_mutex_unlock(&monitorLock); return ret; } diff -Nru entangle-0.5.1/src/backend/entangle-image-loader.c entangle-0.5.2/src/backend/entangle-image-loader.c --- entangle-0.5.1/src/backend/entangle-image-loader.c 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/backend/entangle-image-loader.c 2013-08-17 18:27:47.000000000 +0000 @@ -80,28 +80,20 @@ static GdkPixbuf *entangle_image_loader_pixbuf_load(EntanglePixbufLoader *loader G_GNUC_UNUSED, - EntangleImage *image) + EntangleImage *image, + GExiv2Metadata **metadata) { EntangleImageLoaderPrivate *priv = (ENTANGLE_IMAGE_LOADER(loader))->priv; if (priv->embeddedPreview) return entangle_pixbuf_open_image(image, - ENTANGLE_PIXBUF_IMAGE_SLOT_PREVIEW); + ENTANGLE_PIXBUF_IMAGE_SLOT_PREVIEW, + TRUE, + metadata); else return entangle_pixbuf_open_image(image, - ENTANGLE_PIXBUF_IMAGE_SLOT_MASTER); -} - -static GExiv2Metadata *entangle_image_loader_metadata_load(EntanglePixbufLoader *loader G_GNUC_UNUSED, - EntangleImage *image) -{ - GExiv2Metadata *metadata = gexiv2_metadata_new(); - - if (!gexiv2_metadata_open_path(metadata, entangle_image_get_filename(image), NULL)) { - g_object_unref(metadata); - metadata = NULL; - } - - return metadata; + ENTANGLE_PIXBUF_IMAGE_SLOT_MASTER, + TRUE, + metadata); } @@ -126,7 +118,6 @@ G_PARAM_STATIC_BLURB)); loader_class->pixbuf_load = entangle_image_loader_pixbuf_load; - loader_class->metadata_load = entangle_image_loader_metadata_load; g_type_class_add_private(klass, sizeof(EntangleImageLoaderPrivate)); } diff -Nru entangle-0.5.1/src/backend/entangle-pixbuf-loader.c entangle-0.5.2/src/backend/entangle-pixbuf-loader.c --- entangle-0.5.1/src/backend/entangle-pixbuf-loader.c 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/backend/entangle-pixbuf-loader.c 2013-08-17 18:27:47.000000000 +0000 @@ -71,6 +71,36 @@ }; +struct idle_emit_data { + EntangleImage *image; + EntanglePixbufLoader *loader; + const char *name; +}; + +static gboolean do_idle_emit_func(gpointer opaque) +{ + struct idle_emit_data *data = opaque; + + g_signal_emit_by_name(data->loader, data->name, data->image); + g_object_unref(data->image); + g_object_unref(data->loader); + g_free(data); + + return FALSE; +} + +static void do_idle_emit(EntanglePixbufLoader *loader, + const char *name, + EntangleImage *image) +{ + struct idle_emit_data *data = g_new0(struct idle_emit_data, 1); + data->loader = g_object_ref(loader); + data->image = g_object_ref(image); + data->name = name; + g_idle_add(do_idle_emit_func, data); +} + + static void entangle_pixbuf_loader_get_property(GObject *object, guint prop_id, GValue *value, @@ -211,9 +241,9 @@ if (entry->refs) { g_mutex_unlock(priv->lock); ENTANGLE_DEBUG("Emit loaded %p %p %p", result->image, result->pixbuf, result->metadata); - g_signal_emit_by_name(loader, "pixbuf-loaded", result->image); + do_idle_emit(loader, "pixbuf-loaded", result->image); if (result->metadata) - g_signal_emit_by_name(loader, "metadata-loaded", result->image); + do_idle_emit(loader, "metadata-loaded", result->image); g_mutex_lock(priv->lock); } else if (!entry->pending) { g_hash_table_remove(priv->pixbufs, entangle_image_get_filename(result->image)); @@ -228,15 +258,12 @@ } -static GdkPixbuf *entangle_pixbuf_load(EntanglePixbufLoader *loader, EntangleImage *image) +static GdkPixbuf *entangle_pixbuf_load(EntanglePixbufLoader *loader, EntangleImage *image, + GExiv2Metadata **metadata) { - return ENTANGLE_PIXBUF_LOADER_GET_CLASS(loader)->pixbuf_load(loader, image); + return ENTANGLE_PIXBUF_LOADER_GET_CLASS(loader)->pixbuf_load(loader, image, metadata); } -static GExiv2Metadata *entangle_metadata_load(EntanglePixbufLoader *loader, EntangleImage *image) -{ - return ENTANGLE_PIXBUF_LOADER_GET_CLASS(loader)->metadata_load(loader, image); -} static void entangle_pixbuf_loader_worker(gpointer data, gpointer opaque) @@ -267,7 +294,9 @@ g_object_ref(transform); g_mutex_unlock(priv->lock); - pixbuf = entangle_pixbuf_load(loader, image); + pixbuf = entangle_pixbuf_load(loader, image, + priv->withMetadata ? + &result->metadata : NULL); if (pixbuf) { if (transform) { result->pixbuf = entangle_colour_profile_transform_apply(transform, @@ -277,9 +306,6 @@ result->pixbuf = pixbuf; } } - if (priv->withMetadata) { - result->metadata = entangle_metadata_load(loader, image); - } result->loader = loader; result->image = image; @@ -482,35 +508,6 @@ } -struct idle_emit_data { - EntangleImage *image; - EntanglePixbufLoader *loader; - const char *name; -}; - -static gboolean do_idle_emit_func(gpointer opaque) -{ - struct idle_emit_data *data = opaque; - - g_signal_emit_by_name(data->loader, data->name, data->image); - g_object_unref(data->image); - g_object_unref(data->loader); - g_free(data); - - return FALSE; -} - -static void do_idle_emit(EntanglePixbufLoader *loader, - const char *name, - EntangleImage *image) -{ - struct idle_emit_data *data = g_new0(struct idle_emit_data, 1); - data->loader = g_object_ref(loader); - data->image = g_object_ref(image); - data->name = name; - g_idle_add(do_idle_emit_func, data); -} - gboolean entangle_pixbuf_loader_load(EntanglePixbufLoader *loader, EntangleImage *image) { diff -Nru entangle-0.5.1/src/backend/entangle-pixbuf-loader.h entangle-0.5.2/src/backend/entangle-pixbuf-loader.h --- entangle-0.5.1/src/backend/entangle-pixbuf-loader.h 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/backend/entangle-pixbuf-loader.h 2013-08-17 18:27:47.000000000 +0000 @@ -58,8 +58,8 @@ void (*pixbuf_unloaded)(EntanglePixbufLoader *loader, EntangleImage *image); void (*metadata_unloaded)(EntanglePixbufLoader *loader, EntangleImage *image); - GdkPixbuf *(*pixbuf_load)(EntanglePixbufLoader *loader, EntangleImage *image); - GExiv2Metadata *(*metadata_load)(EntanglePixbufLoader *loader, EntangleImage *image); + GdkPixbuf *(*pixbuf_load)(EntanglePixbufLoader *loader, EntangleImage *image, + GExiv2Metadata **metadata); }; diff -Nru entangle-0.5.1/src/backend/entangle-pixbuf.c entangle-0.5.2/src/backend/entangle-pixbuf.c --- entangle-0.5.1/src/backend/entangle-pixbuf.c 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/backend/entangle-pixbuf.c 2013-08-17 18:27:47.000000000 +0000 @@ -26,7 +26,8 @@ #include "entangle-pixbuf.h" /* Performs rotation of the thunbnail based on embedded metadata */ -GdkPixbuf *entangle_pixbuf_auto_rotate(GdkPixbuf *src) +GdkPixbuf *entangle_pixbuf_auto_rotate(GdkPixbuf *src, + GExiv2Metadata *metadata) { GdkPixbuf *dest = gdk_pixbuf_apply_embedded_orientation(src); GdkPixbuf *temp; @@ -34,19 +35,22 @@ ENTANGLE_DEBUG("Auto-rotate %p %p\n", src, dest); if (dest == src) { - const char *orientationstr; int transform = 0; - orientationstr = gdk_pixbuf_get_option(src, "tEXt::Entangle::Orientation"); + if (metadata) { + transform = gexiv2_metadata_get_orientation(metadata); + } else { + const char *orientationstr = gdk_pixbuf_get_option(src, "tEXt::Entangle::Orientation"); + + /* If not option, then try the gobject data slot */ + if (!orientationstr) + orientationstr = g_object_get_data(G_OBJECT(src), + "tEXt::Entangle::Orientation"); - /* If not option, then try the gobject data slot */ - if (!orientationstr) - orientationstr = g_object_get_data(G_OBJECT(src), - "tEXt::Entangle::Orientation"); + if (orientationstr) + transform = (int)g_ascii_strtoll(orientationstr, NULL, 10); - if (orientationstr) - transform = (int)g_ascii_strtoll(orientationstr, NULL, 10); - - ENTANGLE_DEBUG("Auto-rotate %s\n", orientationstr); + ENTANGLE_DEBUG("Auto-rotate %s\n", orientationstr); + } /* Apply the actual transforms, which involve rotations and flips. The meaning of orientation values 1-8 and the required transforms @@ -90,8 +94,6 @@ } - g_object_unref(src); - return dest; } @@ -102,19 +104,23 @@ ".crw", ".erf", ".mrw", ".raw", ".rw2", ".raf", NULL }; const char **tmp; - const char *filename = entangle_image_get_filename(image); + char *filename = g_utf8_strdown(entangle_image_get_filename(image), -1); + gboolean ret = TRUE; tmp = extlist; while (*tmp) { const char *ext = *tmp; if (g_str_has_suffix(filename, ext)) - return TRUE; + goto cleanup; tmp++; } - return FALSE; + ret = FALSE; + cleanup: + g_free(filename); + return ret; } @@ -137,6 +143,16 @@ goto cleanup; } + /* + Use default camera parameters to display image + Real work needs to done by a RAW developer anyway + */ + raw->params.use_camera_wb = 1; + raw->params.use_auto_wb = 1; + raw->params.use_camera_matrix = 1; + raw->params.user_qual = 0; + raw->params.fbdd_noiserd = 1; + ENTANGLE_DEBUG("Open raw %s", entangle_image_get_filename(image)); if ((ret = libraw_open_file(raw, entangle_image_get_filename(image))) != 0) { ENTANGLE_DEBUG("Failed to open raw file: %s", @@ -179,7 +195,9 @@ } -static GdkPixbuf *entangle_pixbuf_open_image_master_gdk(EntangleImage *image) +static GdkPixbuf *entangle_pixbuf_open_image_master_gdk(EntangleImage *image, + GExiv2Metadata *metadata, + gboolean applyOrientation) { GdkPixbuf *master; GdkPixbuf *result; @@ -190,19 +208,32 @@ if (!master) return NULL; - result = gdk_pixbuf_apply_embedded_orientation(master); + if (applyOrientation) { + result = entangle_pixbuf_auto_rotate(master, metadata); + g_object_unref(master); + } else { + GExiv2Orientation orient = gexiv2_metadata_get_orientation(metadata); + /* gdk_pixbuf_save doesn't update internal options and there + is no set_option method, so abuse gobject data slots :-( */ + g_object_set_data_full(G_OBJECT(master), + "tEXt::Entangle::Orientation", + g_strdup_printf("%d", orient), + g_free); + result = master; + } - g_object_unref(master); return result; } -static GdkPixbuf *entangle_pixbuf_open_image_master(EntangleImage *image) +static GdkPixbuf *entangle_pixbuf_open_image_master(EntangleImage *image, + GExiv2Metadata *metadata, + gboolean applyOrientation) { if (entangle_pixbuf_is_raw(image)) return entangle_pixbuf_open_image_master_raw(image); else - return entangle_pixbuf_open_image_master_gdk(image); + return entangle_pixbuf_open_image_master_gdk(image, metadata, applyOrientation); } @@ -256,10 +287,86 @@ } +static GdkPixbuf *entangle_pixbuf_open_image_preview_raw(EntangleImage *image, + GExiv2Metadata *metadata, + gboolean applyOrientation) +{ + GdkPixbuf *result = NULL; + GdkPixbufLoader *loader = gdk_pixbuf_loader_new(); + libraw_data_t *raw = libraw_init(0); + libraw_processed_image_t *img = NULL; + int ret; + + if (!raw) { + ENTANGLE_DEBUG("Failed to initialize libraw"); + goto cleanup; + } + + ENTANGLE_DEBUG("Open preview raw %s", entangle_image_get_filename(image)); + if ((ret = libraw_open_file(raw, entangle_image_get_filename(image))) != 0) { + ENTANGLE_DEBUG("Failed to open preview raw file: %s", + libraw_strerror(ret)); + goto cleanup; + } + + ENTANGLE_DEBUG("Unpack preview raw %s", entangle_image_get_filename(image)); + if ((ret = libraw_unpack_thumb(raw)) != 0) { + ENTANGLE_DEBUG("Failed to unpack preview raw file: %s", + libraw_strerror(ret)); + goto cleanup; + } + + ENTANGLE_DEBUG("Adjust preview raw %s", entangle_image_get_filename(image)); + if ((ret = libraw_adjust_sizes_info_only(raw)) != 0) { + ENTANGLE_DEBUG("Failed to adjust preview raw file: %s", + libraw_strerror(ret)); + goto cleanup; + } + + ENTANGLE_DEBUG("Make preview mem %s", entangle_image_get_filename(image)); + if ((img = libraw_dcraw_make_mem_thumb(raw, &ret)) == NULL) { + ENTANGLE_DEBUG("Failed to extract preview raw file: %s", + libraw_strerror(ret)); + goto cleanup; + } + + gdk_pixbuf_loader_write(loader, img->data, img->data_size, NULL); + result = gdk_pixbuf_loader_get_pixbuf(loader); + + if (result) { + g_object_ref(result); + if (applyOrientation) { + GdkPixbuf *tmp = entangle_pixbuf_auto_rotate(result, metadata); + g_object_unref(result); + result = tmp; + } else { + GExiv2Orientation orient = gexiv2_metadata_get_orientation(metadata); + /* gdk_pixbuf_save doesn't update internal options and there + is no set_option method, so abuse gobject data slots :-( */ + g_object_set_data_full(G_OBJECT(result), + "tEXt::Entangle::Orientation", + g_strdup_printf("%d", orient), + g_free); + } + } + + + cleanup: + if (img) + libraw_dcraw_clear_mem(img); + + libraw_close(raw); + + gdk_pixbuf_loader_close(loader, NULL); + + return result; +} + + static GdkPixbuf *entangle_pixbuf_open_image_preview_exiv(EntangleImage *image, - guint minSize) + guint minSize, + GExiv2Metadata *metadata) { - GExiv2Metadata *metadata = gexiv2_metadata_new(); GExiv2PreviewImage *preview = NULL; GExiv2PreviewProperties **props; GExiv2PreviewProperties *best; @@ -271,11 +378,6 @@ ENTANGLE_DEBUG("Opening preview %s", entangle_image_get_filename(image)); - if (!gexiv2_metadata_open_path(metadata, entangle_image_get_filename(image), NULL)) { - ENTANGLE_DEBUG("Unable to load exiv2 data"); - goto cleanup; - } - props = gexiv2_metadata_get_preview_properties(metadata); if (minSize) @@ -315,59 +417,84 @@ g_strdup_printf("%d", orient), g_free); - result = entangle_pixbuf_auto_rotate(master); - cleanup: if (loader) g_object_unref(loader); if (preview) g_object_unref(preview); - if (metadata) - g_object_unref(metadata); return result; } -static GdkPixbuf *entangle_pixbuf_open_image_preview(EntangleImage *image) +static GdkPixbuf *entangle_pixbuf_open_image_preview(EntangleImage *image, + GExiv2Metadata *metadata, + gboolean applyOrientation) { + GdkPixbuf *result = NULL; if (entangle_pixbuf_is_raw(image)) { - GdkPixbuf *result = entangle_pixbuf_open_image_preview_exiv(image, 256); + result = entangle_pixbuf_open_image_preview_raw(image, metadata, applyOrientation); + if (!result && metadata) + result = entangle_pixbuf_open_image_preview_exiv(image, 256, metadata); if (!result) result = entangle_pixbuf_open_image_master_raw(image); - return result; } else { - return entangle_pixbuf_open_image_master_gdk(image); + result = entangle_pixbuf_open_image_master_gdk(image, metadata, applyOrientation); } + return result; } -static GdkPixbuf *entangle_pixbuf_open_image_thumbnail(EntangleImage *image) +static GdkPixbuf *entangle_pixbuf_open_image_thumbnail(EntangleImage *image, + GExiv2Metadata *metadata, + gboolean applyOrientation) { - GdkPixbuf *result = entangle_pixbuf_open_image_preview_exiv(image, 128); + GdkPixbuf *result = NULL; + if (entangle_pixbuf_is_raw(image)) + result = entangle_pixbuf_open_image_preview_raw(image, metadata, applyOrientation); + if (!result && metadata) + result = entangle_pixbuf_open_image_preview_exiv(image, 128, metadata); if (!result) - result = entangle_pixbuf_open_image_master(image); + result = entangle_pixbuf_open_image_master(image, metadata, applyOrientation); return result; } GdkPixbuf *entangle_pixbuf_open_image(EntangleImage *image, - EntanglePixbufImageSlot slot) + EntanglePixbufImageSlot slot, + gboolean applyOrientation, + GExiv2Metadata **metadata) { ENTANGLE_DEBUG("Open image %s %d", entangle_image_get_filename(image), slot); + GExiv2Metadata *themetadata = gexiv2_metadata_new(); + GdkPixbuf *ret = NULL; + + if (!gexiv2_metadata_open_path(themetadata, entangle_image_get_filename(image), NULL)) { + g_object_unref(themetadata); + themetadata = NULL; + } + switch (slot) { case ENTANGLE_PIXBUF_IMAGE_SLOT_MASTER: - return entangle_pixbuf_open_image_master(image); + ret = entangle_pixbuf_open_image_master(image, themetadata, applyOrientation); + break; case ENTANGLE_PIXBUF_IMAGE_SLOT_PREVIEW: - return entangle_pixbuf_open_image_preview(image); + ret = entangle_pixbuf_open_image_preview(image, themetadata, applyOrientation); + break; case ENTANGLE_PIXBUF_IMAGE_SLOT_THUMBNAIL: - return entangle_pixbuf_open_image_thumbnail(image); + ret = entangle_pixbuf_open_image_thumbnail(image, themetadata, applyOrientation); + break; default: g_warn_if_reached(); - return NULL; + break; } + if (metadata) + *metadata = themetadata; + else + g_object_unref(themetadata); + return ret; } /* diff -Nru entangle-0.5.1/src/backend/entangle-pixbuf.h entangle-0.5.2/src/backend/entangle-pixbuf.h --- entangle-0.5.1/src/backend/entangle-pixbuf.h 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/backend/entangle-pixbuf.h 2013-08-17 18:27:47.000000000 +0000 @@ -22,11 +22,13 @@ #define __ENTANGLE_PIXBUF_H__ #include +#include #include "entangle-image.h" G_BEGIN_DECLS -GdkPixbuf *entangle_pixbuf_auto_rotate(GdkPixbuf *src); +GdkPixbuf *entangle_pixbuf_auto_rotate(GdkPixbuf *src, + GExiv2Metadata *metadata); typedef enum { ENTANGLE_PIXBUF_IMAGE_SLOT_MASTER, @@ -35,7 +37,9 @@ } EntanglePixbufImageSlot; GdkPixbuf *entangle_pixbuf_open_image(EntangleImage *image, - EntanglePixbufImageSlot slot); + EntanglePixbufImageSlot slot, + gboolean applyOrientation, + GExiv2Metadata **metadata); #endif /* __ENTANGLE_PIXBUF_H__ */ diff -Nru entangle-0.5.1/src/backend/entangle-preferences.c entangle-0.5.2/src/backend/entangle-preferences.c --- entangle-0.5.1/src/backend/entangle-preferences.c 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/backend/entangle-preferences.c 2013-08-17 18:27:47.000000000 +0000 @@ -51,6 +51,7 @@ #define SETTING_INTERFACE_AUTO_CONNECT "auto-connect" #define SETTING_INTERFACE_SCREEN_BLANK "screen-blank" #define SETTING_INTERFACE_PLUGINS "plugins" +#define SETTING_INTERFACE_HISTOGRAM_LINEAR "histogram-linear" #define SETTING_CAPTURE_FILENAME_PATTERN "filename-pattern" #define SETTING_CAPTURE_LAST_SESSION "last-session" @@ -72,8 +73,10 @@ #define SETTING_IMG_ONION_SKIN "onion-skin" #define SETTING_IMG_ONION_LAYERS "onion-layers" + #define PROP_NAME_INTERFACE_AUTO_CONNECT SETTING_INTERFACE "-" SETTING_INTERFACE_AUTO_CONNECT #define PROP_NAME_INTERFACE_SCREEN_BLANK SETTING_INTERFACE "-" SETTING_INTERFACE_SCREEN_BLANK +#define PROP_NAME_INTERFACE_HISTOGRAM_LINEAR SETTING_INTERFACE "-" SETTING_INTERFACE_HISTOGRAM_LINEAR #define PROP_NAME_CAPTURE_FILENAME_PATTERN SETTING_CAPTURE "-" SETTING_CAPTURE_FILENAME_PATTERN #define PROP_NAME_CAPTURE_LAST_SESSION SETTING_CAPTURE "-" SETTING_CAPTURE_LAST_SESSION @@ -100,6 +103,7 @@ PROP_INTERFACE_AUTO_CONNECT, PROP_INTERFACE_SCREEN_BLANK, + PROP_INTERFACE_HISTOGRAM_LINEAR, PROP_CAPTURE_FILENAME_PATTERN, PROP_CAPTURE_LAST_SESSION, @@ -172,6 +176,12 @@ SETTING_INTERFACE_SCREEN_BLANK)); break; + case PROP_INTERFACE_HISTOGRAM_LINEAR: + g_value_set_boolean(value, + g_settings_get_boolean(priv->interfaceSettings, + SETTING_INTERFACE_HISTOGRAM_LINEAR)); + break; + case PROP_CAPTURE_LAST_SESSION: dir = g_settings_get_string(priv->captureSettings, SETTING_CAPTURE_LAST_SESSION); @@ -316,6 +326,12 @@ g_value_get_boolean(value)); break; + case PROP_INTERFACE_HISTOGRAM_LINEAR: + g_settings_set_boolean(priv->interfaceSettings, + SETTING_INTERFACE_HISTOGRAM_LINEAR, + g_value_get_boolean(value)); + break; + case PROP_CAPTURE_LAST_SESSION: g_settings_set_string(priv->captureSettings, SETTING_CAPTURE_LAST_SESSION, @@ -484,6 +500,17 @@ G_PARAM_STATIC_BLURB)); g_object_class_install_property(object_class, + PROP_INTERFACE_HISTOGRAM_LINEAR, + g_param_spec_boolean(PROP_NAME_INTERFACE_HISTOGRAM_LINEAR, + "Linear histogram", + "Use linear histogram", + FALSE, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + + g_object_class_install_property(object_class, PROP_CAPTURE_LAST_SESSION, g_param_spec_string(PROP_NAME_CAPTURE_LAST_SESSION, "Pictures directory", @@ -771,6 +798,29 @@ } +gboolean entangle_preferences_interface_get_histogram_linear(EntanglePreferences *prefs) +{ + g_return_val_if_fail(ENTANGLE_IS_PREFERENCES(prefs), FALSE); + + EntanglePreferencesPrivate *priv = prefs->priv; + + return g_settings_get_boolean(priv->interfaceSettings, + SETTING_INTERFACE_HISTOGRAM_LINEAR); +} + + +void entangle_preferences_interface_set_histogram_linear(EntanglePreferences *prefs, gboolean enabled) +{ + g_return_if_fail(ENTANGLE_IS_PREFERENCES(prefs)); + + EntanglePreferencesPrivate *priv = prefs->priv; + + g_settings_set_boolean(priv->interfaceSettings, + SETTING_INTERFACE_HISTOGRAM_LINEAR, enabled); + g_object_notify(G_OBJECT(prefs), PROP_NAME_INTERFACE_HISTOGRAM_LINEAR); +} + + gchar **entangle_preferences_interface_get_plugins(EntanglePreferences *prefs) { g_return_val_if_fail(ENTANGLE_IS_PREFERENCES(prefs), NULL); diff -Nru entangle-0.5.1/src/backend/entangle-preferences.h entangle-0.5.2/src/backend/entangle-preferences.h --- entangle-0.5.1/src/backend/entangle-preferences.h 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/backend/entangle-preferences.h 2013-08-17 18:27:47.000000000 +0000 @@ -64,6 +64,8 @@ gchar **entangle_preferences_interface_get_plugins(EntanglePreferences *prefs); void entangle_preferences_interface_add_plugin(EntanglePreferences *prefs, const char *name); void entangle_preferences_interface_remove_plugin(EntanglePreferences *prefs, const char *name); +gboolean entangle_preferences_interface_get_histogram_linear(EntanglePreferences *prefs); +void entangle_preferences_interface_set_histogram_linear(EntanglePreferences *prefs, gboolean enabled); char *entangle_preferences_capture_get_last_session(EntanglePreferences *prefs); void entangle_preferences_capture_set_last_session(EntanglePreferences *prefs, const gchar *dir); diff -Nru entangle-0.5.1/src/backend/entangle-session.c entangle-0.5.2/src/backend/entangle-session.c --- entangle-0.5.1/src/backend/entangle-session.c 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/backend/entangle-session.c 2013-08-17 18:27:47.000000000 +0000 @@ -330,8 +330,6 @@ char *prefix; char *format; char *filename; - int i; - int max; int ndigits; ENTANGLE_DEBUG("NEXT FILENAME '%s'", template); @@ -353,9 +351,6 @@ ndigits = postfix - template; - for (max = 1, i = 0 ; i < ndigits ; i++) - max *= 10; - format = g_strdup_printf("%%s%%0%dd%%s", ndigits); ENTANGLE_DEBUG("Format '%s' prefix='%s' postfix='%s' ndigits=%d nextDigits=%d", @@ -461,6 +456,35 @@ } +static gboolean entangle_session_image_supported(const gchar *name) +{ + const char *extlist[] = { + ".cr2", ".nef", ".nrw", ".arw", ".orf", ".dng", ".pef", + ".crw", ".erf", ".mrw", ".raw", ".rw2", ".raf", ".jpg", + ".jpeg", ".png", ".tif", ".tiff", NULL + }; + const char **tmp; + char *filename = g_utf8_strdown(name, -1); + gboolean ret = TRUE; + + tmp = extlist; + while (*tmp) { + const char *ext = *tmp; + + if (g_str_has_suffix(filename, ext)) + goto cleanup; + + tmp++; + } + + ret = FALSE; + + cleanup: + g_free(filename); + return ret; +} + + gboolean entangle_session_load(EntangleSession *session) { g_return_val_if_fail(ENTANGLE_IS_SESSION(session), FALSE); @@ -479,12 +503,14 @@ if (g_file_info_get_file_type(childinfo) == G_FILE_TYPE_REGULAR || g_file_info_get_file_type(childinfo) == G_FILE_TYPE_SYMBOLIC_LINK) { - EntangleImage *image = entangle_image_new_file(g_file_get_path(child)); + if (entangle_session_image_supported(thisname)) { + EntangleImage *image = entangle_image_new_file(g_file_get_path(child)); - ENTANGLE_DEBUG("Adding '%s'", g_file_get_path(child)); - entangle_session_add(session, image); + ENTANGLE_DEBUG("Adding '%s'", g_file_get_path(child)); + entangle_session_add(session, image); - g_object_unref(image); + g_object_unref(image); + } } g_object_unref(child); g_object_unref(childinfo); diff -Nru entangle-0.5.1/src/backend/entangle-thumbnail-loader.c entangle-0.5.2/src/backend/entangle-thumbnail-loader.c --- entangle-0.5.1/src/backend/entangle-thumbnail-loader.c 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/backend/entangle-thumbnail-loader.c 2013-08-17 18:27:47.000000000 +0000 @@ -133,7 +133,8 @@ EntangleImage *image, const char *uri, const char *thumbname, - time_t mtime) + time_t mtime, + GExiv2Metadata **metadata) { GdkPixbuf *master; GdkPixbuf *thumb = NULL; @@ -149,7 +150,9 @@ const char *orientationstr; master = entangle_pixbuf_open_image(image, - ENTANGLE_PIXBUF_IMAGE_SLOT_THUMBNAIL); + ENTANGLE_PIXBUF_IMAGE_SLOT_THUMBNAIL, + FALSE, + metadata); if (!master) return NULL; @@ -209,7 +212,8 @@ static GdkPixbuf *entangle_thumbnail_loader_pixbuf_load(EntanglePixbufLoader *loader, - EntangleImage *image) + EntangleImage *image, + GExiv2Metadata **metadata G_GNUC_UNUSED) { EntangleThumbnailLoader *tloader = ENTANGLE_THUMBNAIL_LOADER(loader); EntangleThumbnailLoaderPrivate *priv = tloader->priv; @@ -218,6 +222,7 @@ GdkPixbuf *result = NULL; GdkPixbuf *thumb = NULL; struct stat sb; + GExiv2Metadata *themetadata = NULL; /* Sanity check that the base image still exists */ if (stat(entangle_image_get_filename(image), &sb) < 0) { @@ -257,12 +262,13 @@ thumb = entangle_thumbnail_loader_generate(loader, image, uri, thumbname, - sb.st_mtime); + sb.st_mtime, + &themetadata); } /* Apply any rotation hints so it is "normal" for the viewer */ if (thumb) { - GdkPixbuf *tmp = entangle_pixbuf_auto_rotate(thumb); + GdkPixbuf *tmp = entangle_pixbuf_auto_rotate(thumb, themetadata); g_object_unref(thumb); thumb = tmp; } @@ -316,6 +322,8 @@ } cleanup: + if (themetadata) + g_object_unref(themetadata); g_free(uri); g_free(thumbname); diff -Nru entangle-0.5.1/src/entangle-main.c entangle-0.5.2/src/entangle-main.c --- entangle-0.5.1/src/entangle-main.c 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/entangle-main.c 2013-08-17 18:27:47.000000000 +0000 @@ -57,9 +57,6 @@ g_set_application_name("Entangle"); - g_thread_init(NULL); - gdk_threads_init(); - group = g_option_group_new("entangle", "Entangle application options", "Show Entangle options", diff -Nru entangle-0.5.1/src/frontend/entangle-application.c entangle-0.5.2/src/frontend/entangle-application.c --- entangle-0.5.1/src/frontend/entangle-application.c 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/frontend/entangle-application.c 2013-08-17 18:27:47.000000000 +0000 @@ -161,7 +161,6 @@ EntangleApplicationPrivate *priv = app->priv; GList *cameras = NULL, *tmp; - gdk_threads_enter(); if (entangle_preferences_interface_get_auto_connect(priv->preferences)) cameras = tmp = entangle_camera_list_get_cameras(priv->cameras); @@ -185,8 +184,6 @@ g_list_free(cameras); } - gdk_threads_leave(); - (*G_APPLICATION_CLASS(entangle_application_parent_class)->startup)(gapp); } diff -Nru entangle-0.5.1/src/frontend/entangle-camera-manager.c entangle-0.5.2/src/frontend/entangle-camera-manager.c --- entangle-0.5.1/src/frontend/entangle-camera-manager.c 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/frontend/entangle-camera-manager.c 2013-08-17 18:27:47.000000000 +0000 @@ -73,6 +73,7 @@ EntangleImageLoader *imageLoader; EntangleThumbnailLoader *thumbLoader; EntangleColourProfileTransform *colourTransform; + GtkScrolledWindow *imageScroll; EntangleImageDisplay *imageDisplay; EntangleImageStatusbar *imageStatusbar; ViewAutoDrawer *imageDrawer; @@ -90,6 +91,10 @@ gint presentationMonitor; GHashTable *popups; + gdouble imageScrollVOffset; + gdouble imageScrollHOffset; + gboolean imageScrollRestored; + int zoomLevel; gulong sigFileDownload; @@ -344,6 +349,18 @@ } +static void entangle_camera_manager_update_histogram_linear(EntangleCameraManager *manager) +{ + g_return_if_fail(ENTANGLE_IS_CAMERA_MANAGER(manager)); + + EntangleCameraManagerPrivate *priv = manager->priv; + EntanglePreferences *prefs = entangle_application_get_preferences(priv->application); + gboolean histogram_linear = entangle_preferences_interface_get_histogram_linear(prefs); + + entangle_image_histogram_set_histogram_linear(priv->imageHistogram, histogram_linear); +} + + static void do_presentation_monitor_toggled(GtkCheckMenuItem *menu, gpointer data) { g_return_if_fail(ENTANGLE_IS_CAMERA_MANAGER(data)); @@ -440,7 +457,9 @@ EntangleCameraManager *manager = ENTANGLE_CAMERA_MANAGER(data); - if (g_str_equal(spec->name, "cms-enabled") || + if (g_str_equal(spec->name, "interface-histogram-linear")) { + entangle_camera_manager_update_histogram_linear(manager); + } else if (g_str_equal(spec->name, "cms-enabled") || g_str_equal(spec->name, "cms-rgb-profile") || g_str_equal(spec->name, "cms-monitor-profile") || g_str_equal(spec->name, "cms-detect-system-profile") || @@ -545,6 +564,29 @@ } +static void do_restore_scroll(GtkWidget *widget, + GdkRectangle *allocation G_GNUC_UNUSED, + EntangleCameraManager *manager) +{ + g_return_if_fail(ENTANGLE_IS_CAMERA_MANAGER(manager)); + GtkAdjustment *hadjust; + GtkAdjustment *vadjust; + EntangleCameraManagerPrivate *priv = manager->priv; + + if (!entangle_image_display_get_loaded(ENTANGLE_IMAGE_DISPLAY(widget))) + return; + + hadjust = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(priv->imageScroll)); + vadjust = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(priv->imageScroll)); + + gtk_adjustment_set_value(hadjust, + priv->imageScrollHOffset); + gtk_adjustment_set_value(vadjust, + priv->imageScrollVOffset); + priv->imageScrollRestored = TRUE; +} + + static void do_select_image(EntangleCameraManager *manager, EntangleImage *image) { @@ -553,6 +595,8 @@ GList *newimages = NULL; GList *oldimages; GList *tmp; + GtkAdjustment *hadjust; + GtkAdjustment *vadjust; EntangleCameraManagerPrivate *priv = manager->priv; EntanglePreferences *prefs = entangle_application_get_preferences(priv->application); @@ -598,6 +642,15 @@ tmp = tmp->next; } + hadjust = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(priv->imageScroll)); + vadjust = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(priv->imageScroll)); + + if (priv->imageScrollRestored) { + priv->imageScrollHOffset = gtk_adjustment_get_value(hadjust); + priv->imageScrollVOffset = gtk_adjustment_get_value(vadjust); + priv->imageScrollRestored = FALSE; + } + entangle_image_display_set_image_list(priv->imageDisplay, newimages); if (image) @@ -623,7 +676,6 @@ { g_return_if_fail(ENTANGLE_IS_CAMERA_MANAGER(manager)); - gdk_threads_enter(); GtkWidget *msg = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, @@ -639,7 +691,6 @@ G_CALLBACK (gtk_widget_destroy), msg); gtk_widget_show_all(msg); - gdk_threads_leave(); } @@ -658,7 +709,6 @@ GError *error = NULL; if (!entangle_camera_load_controls_finish(camera, result, &error)) { - gdk_threads_enter(); GtkWidget *msg = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, @@ -674,7 +724,6 @@ G_CALLBACK (gtk_widget_destroy), msg); gtk_widget_show_all(msg); - gdk_threads_leave(); g_error_free(error); } @@ -710,12 +759,10 @@ return; } - gdk_threads_enter(); if (!priv->cameraReady) { priv->cameraReady = TRUE; do_capture_widget_sensitivity(manager); } - gdk_threads_leave(); if (!priv->camera) return; @@ -800,7 +847,6 @@ do_camera_preview_image_finish, data); } else { - gdk_threads_enter(); preview = GTK_WIDGET(gtk_builder_get_object(priv->builder, "toolbar-preview")); gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(preview), FALSE); @@ -808,7 +854,6 @@ priv->taskActive = priv->taskPreview = priv->taskCapture = FALSE; do_capture_widget_sensitivity(data->manager); - gdk_threads_leave(); g_cancellable_reset(priv->taskConfirm); g_cancellable_reset(priv->taskCancel); @@ -841,10 +886,8 @@ ENTANGLE_DEBUG("Saved to %s", localpath); image = entangle_image_new_file(localpath); - gdk_threads_enter(); entangle_session_add(priv->session, image); do_select_image(manager, image); - gdk_threads_leave(); g_object_unref(image); @@ -1113,9 +1156,7 @@ image = entangle_image_new_pixbuf(pixbuf); - gdk_threads_enter(); do_select_image(manager, image); - gdk_threads_leave(); g_object_unref(pixbuf); g_object_unref(is); @@ -1132,8 +1173,6 @@ GtkWidget *mtr; GtkWidget *operation; - gdk_threads_enter(); - priv->taskTarget = target; mtr = GTK_WIDGET(gtk_builder_get_object(priv->builder, "toolbar-progress")); operation = GTK_WIDGET(gtk_builder_get_object(priv->builder, "toolbar-operation")); @@ -1143,8 +1182,6 @@ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(mtr), 0); gtk_widget_show(operation); - - gdk_threads_leave(); } @@ -1156,13 +1193,9 @@ EntangleCameraManagerPrivate *priv = manager->priv; GtkWidget *mtr; - gdk_threads_enter(); - mtr = GTK_WIDGET(gtk_builder_get_object(priv->builder, "toolbar-progress")); gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(mtr), current / priv->taskTarget); - - gdk_threads_leave(); } @@ -1175,8 +1208,6 @@ GtkWidget *mtr; GtkWidget *operation; - gdk_threads_enter(); - mtr = GTK_WIDGET(gtk_builder_get_object(priv->builder, "toolbar-progress")); operation = GTK_WIDGET(gtk_builder_get_object(priv->builder, "toolbar-operation")); @@ -1185,8 +1216,6 @@ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(mtr), 0); gtk_widget_hide(operation); - - gdk_threads_leave(); } @@ -1251,12 +1280,9 @@ GError *error = NULL; if (entangle_camera_load_controls_finish(cam, result, &error)) { - gdk_threads_enter(); do_capture_widget_sensitivity(manager); entangle_control_panel_set_camera(priv->controlPanel, priv->camera); - gdk_threads_leave(); } else { - gdk_threads_enter(); GtkWidget *msg = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, @@ -1272,7 +1298,6 @@ G_CALLBACK (gtk_widget_destroy), msg); gtk_widget_show_all(msg); - gdk_threads_leave(); g_error_free(error); } @@ -1300,7 +1325,6 @@ manager); } else { int response; - gdk_threads_enter(); GtkWidget *msg = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, @@ -1330,7 +1354,6 @@ do_camera_connect_finish, manager); } - gdk_threads_leave(); g_error_free(error); } } @@ -1387,7 +1410,6 @@ do_camera_connect_finish, manager); } else { - gdk_threads_enter(); GtkWidget *msg = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, @@ -1404,7 +1426,6 @@ msg); gtk_widget_show_all(msg); entangle_camera_manager_set_camera(manager, NULL); - gdk_threads_leave(); g_error_free(error); } @@ -1419,9 +1440,7 @@ EntangleCameraManager *manager = ENTANGLE_CAMERA_MANAGER(data); EntangleCameraManagerPrivate *priv = manager->priv; - gdk_threads_enter(); priv->cameraChanged = TRUE; - gdk_threads_leave(); } @@ -1497,12 +1516,9 @@ EntangleCameraManager *manager = ENTANGLE_CAMERA_MANAGER(data); EntangleCameraManagerPrivate *priv = manager->priv; - gdk_threads_enter(); if (priv->camera == camera) entangle_camera_manager_set_camera(manager, NULL); - - gdk_threads_leave(); } @@ -1540,6 +1556,14 @@ g_signal_connect(cameras, "camera-removed", G_CALLBACK(do_camera_removed), manager); directory = entangle_preferences_capture_get_last_session(prefs); pattern = entangle_preferences_capture_get_filename_pattern(prefs); + + entangle_camera_manager_update_histogram_linear(manager); + entangle_camera_manager_update_colour_transform(manager); + entangle_camera_manager_update_aspect_ratio(manager); + entangle_camera_manager_update_mask_opacity(manager); + entangle_camera_manager_update_mask_enabled(manager); + entangle_camera_manager_update_image_loader(manager); + priv->session = entangle_session_new(directory, pattern); chooser = GTK_WIDGET(gtk_builder_get_object(priv->builder, "toolbar-session-button")); @@ -1551,11 +1575,6 @@ g_free(directory); g_free(pattern); - entangle_camera_manager_update_colour_transform(manager); - entangle_camera_manager_update_aspect_ratio(manager); - entangle_camera_manager_update_mask_opacity(manager); - entangle_camera_manager_update_mask_enabled(manager); - entangle_camera_manager_update_image_loader(manager); break; default: @@ -2061,7 +2080,6 @@ GError *error = NULL; if (!entangle_camera_autofocus_finish(camera, result, &error)) { - gdk_threads_enter(); GtkWidget *msg = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, @@ -2077,7 +2095,6 @@ G_CALLBACK (gtk_widget_destroy), msg); gtk_widget_show_all(msg); - gdk_threads_leave(); g_error_free(error); } @@ -2094,7 +2111,6 @@ GError *error = NULL; if (!entangle_camera_manualfocus_finish(camera, result, &error)) { - gdk_threads_enter(); GtkWidget *msg = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, @@ -2110,7 +2126,6 @@ G_CALLBACK (gtk_widget_destroy), msg); gtk_widget_show_all(msg); - gdk_threads_leave(); g_error_free(error); } @@ -2152,6 +2167,12 @@ entangle_preferences_img_set_mask_enabled(prefs, !enabled); } break; + case GDK_KEY_h: { + EntanglePreferences *prefs = entangle_application_get_preferences(priv->application); + gboolean linear = entangle_preferences_interface_get_histogram_linear(prefs); + entangle_preferences_interface_set_histogram_linear(prefs, !linear); + } break; + case GDK_KEY_a: { if (priv->taskPreview) { entangle_camera_autofocus_async(priv->camera, @@ -2911,9 +2932,7 @@ GdkPixbuf *pixbuf = entangle_pixbuf_loader_get_pixbuf(loader, image); - gdk_threads_enter(); entangle_image_set_pixbuf(image, pixbuf); - gdk_threads_leave(); } @@ -2924,9 +2943,7 @@ GExiv2Metadata *metadata = entangle_pixbuf_loader_get_metadata(loader, image); - gdk_threads_enter(); entangle_image_set_metadata(image, metadata); - gdk_threads_leave(); } @@ -2935,9 +2952,7 @@ { g_return_if_fail(ENTANGLE_IS_IMAGE(image)); - gdk_threads_enter(); entangle_image_set_pixbuf(image, NULL); - gdk_threads_leave(); } @@ -2946,9 +2961,7 @@ { g_return_if_fail(ENTANGLE_IS_IMAGE(image)); - gdk_threads_enter(); entangle_image_set_metadata(image, NULL); - gdk_threads_leave(); } @@ -2959,9 +2972,7 @@ EntangleCameraManager *manager = data; EntangleCameraManagerPrivate *priv = manager->priv; - gdk_threads_enter(); ViewAutoDrawer_SetPinned(VIEW_AUTODRAWER(priv->imageDrawer), FALSE); - gdk_threads_leave(); priv->imageDrawerTimer = 0; return FALSE; } @@ -2988,9 +2999,7 @@ static void entangle_camera_manager_init(EntangleCameraManager *manager) { EntangleCameraManagerPrivate *priv; - GtkWidget *viewport; GtkWidget *display; - GtkWidget *imageScroll; GtkWidget *iconScroll; GtkWidget *settingsBox; GtkWidget *settingsViewport; @@ -2998,6 +3007,7 @@ GtkWidget *menu; GtkWidget *monitorMenu; GtkWidget *operation; + GtkWidget *imageViewport; GError *error = NULL; priv = manager->priv = ENTANGLE_CAMERA_MANAGER_GET_PRIVATE(manager); @@ -3012,6 +3022,9 @@ if (error) g_error(_("Could not load user interface definition file: %s"), error->message); + priv->imageScrollHOffset = 0; + priv->imageScrollVOffset = 0; + gtk_builder_connect_signals(priv->builder, manager); win = GTK_WIDGET(gtk_builder_get_object(priv->builder, "camera-manager")); @@ -3022,7 +3035,12 @@ monitorMenu = entangle_camera_manager_monitor_menu(manager); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), monitorMenu); - viewport = GTK_WIDGET(gtk_builder_get_object(priv->builder, "image-viewport")); + imageViewport = gtk_viewport_new(NULL, NULL); + priv->imageScroll = GTK_SCROLLED_WINDOW + (gtk_scrolled_window_new(gtk_scrollable_get_hadjustment(GTK_SCROLLABLE(imageViewport)), + gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(imageViewport)))); + + gtk_container_add(GTK_CONTAINER(priv->imageScroll), imageViewport); priv->imageLoader = entangle_image_loader_new(); priv->thumbLoader = entangle_thumbnail_loader_new(96, 96); @@ -3043,6 +3061,9 @@ g_object_set(priv->sessionBrowser, "thumbnail-loader", priv->thumbLoader, NULL); + g_signal_connect(priv->imageDisplay, "size-allocate", + G_CALLBACK(do_restore_scroll), manager); + g_signal_connect(priv->sessionBrowser, "selection-changed", G_CALLBACK(do_session_image_selected), manager); g_signal_connect(priv->sessionBrowser, "button-press-event", @@ -3050,19 +3071,15 @@ g_signal_connect(priv->sessionBrowser, "drag-failed", G_CALLBACK(do_session_browser_drag_failed), manager); - imageScroll = GTK_WIDGET(gtk_builder_get_object(priv->builder, "image-scroll")); - iconScroll = GTK_WIDGET(gtk_builder_get_object(priv->builder, "icon-scroll")); settingsBox = GTK_WIDGET(gtk_builder_get_object(priv->builder, "settings-box")); settingsViewport = GTK_WIDGET(gtk_builder_get_object(priv->builder, "settings-viewport")); display = GTK_WIDGET(gtk_builder_get_object(priv->builder, "display-panel")); + iconScroll = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(iconScroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER); - gtk_container_child_set(GTK_CONTAINER(display), imageScroll, "resize", TRUE, NULL); - gtk_container_child_set(GTK_CONTAINER(display), iconScroll, "resize", FALSE, NULL); - /* XXX match icon size + padding + scrollbar needs */ gtk_widget_set_size_request(settingsBox, 300, 100); gtk_widget_set_size_request(iconScroll, 140, 170); @@ -3072,9 +3089,10 @@ g_free, g_object_unref); + gtk_container_add(GTK_CONTAINER(imageViewport), GTK_WIDGET(priv->imageDisplay)); ViewOvBox_SetOver(VIEW_OV_BOX(priv->imageDrawer), GTK_WIDGET(priv->imageStatusbar)); - ViewOvBox_SetUnder(VIEW_OV_BOX(priv->imageDrawer), GTK_WIDGET(priv->imageDisplay)); + ViewOvBox_SetUnder(VIEW_OV_BOX(priv->imageDrawer), GTK_WIDGET(priv->imageScroll)); ViewAutoDrawer_SetOffset(VIEW_AUTODRAWER(priv->imageDrawer), -1); ViewAutoDrawer_SetFill(VIEW_AUTODRAWER(priv->imageDrawer), TRUE); ViewAutoDrawer_SetOverlapPixels(VIEW_AUTODRAWER(priv->imageDrawer), 1); @@ -3091,8 +3109,11 @@ g_signal_connect(GTK_WIDGET(win), "motion-notify-event", G_CALLBACK(do_image_status_show), manager); - ENTANGLE_DEBUG("Adding %p to %p", priv->imageDisplay, viewport); - gtk_container_add(GTK_CONTAINER(viewport), GTK_WIDGET(priv->imageDrawer)); + ENTANGLE_DEBUG("Adding %p to %p", priv->imageDisplay, imageViewport); + gtk_paned_pack1(GTK_PANED(display), GTK_WIDGET(priv->imageDrawer), TRUE, TRUE); + gtk_paned_pack2(GTK_PANED(display), GTK_WIDGET(iconScroll), FALSE, TRUE); + gtk_widget_show_all(display); + gtk_container_add(GTK_CONTAINER(iconScroll), GTK_WIDGET(priv->sessionBrowser)); gtk_container_add(GTK_CONTAINER(settingsViewport), GTK_WIDGET(priv->controlPanel)); gtk_box_pack_start(GTK_BOX(settingsBox), GTK_WIDGET(priv->imageHistogram), FALSE, TRUE, 0); diff -Nru entangle-0.5.1/src/frontend/entangle-camera-manager.xml entangle-0.5.2/src/frontend/entangle-camera-manager.xml --- entangle-0.5.1/src/frontend/entangle-camera-manager.xml 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/frontend/entangle-camera-manager.xml 2013-08-17 18:27:47.000000000 +0000 @@ -17,7 +17,6 @@ False - False True False _File @@ -29,7 +28,6 @@ Select session - False True False False @@ -47,7 +45,6 @@ Connect camera - False True False False @@ -57,7 +54,6 @@ Disconnect camera - False True False False @@ -73,7 +69,6 @@ gtk-close - False True False True @@ -85,7 +80,6 @@ gtk-quit - False True False True @@ -100,7 +94,6 @@ - False True False _Edit @@ -112,7 +105,6 @@ gtk-preferences - False True False True @@ -126,7 +118,6 @@ - False True False _View @@ -138,7 +129,6 @@ gtk-zoom-fit - False True False True @@ -155,7 +145,6 @@ gtk-zoom-out - False True False True @@ -167,7 +156,6 @@ gtk-zoom-100 - False True False True @@ -179,7 +167,6 @@ gtk-zoom-in - False True False True @@ -196,7 +183,6 @@ - False True False Settings @@ -207,7 +193,6 @@ - False True False Fullscreen @@ -218,7 +203,6 @@ - False True False Presentation @@ -235,7 +219,6 @@ - False True False Present on @@ -248,7 +231,6 @@ - False True False Windows @@ -259,7 +241,6 @@ False - False True False New window @@ -270,14 +251,12 @@ - False True False - False True False Synchronize capture @@ -290,7 +269,6 @@ - False True False _Help @@ -302,7 +280,6 @@ gtk-about - False True False True @@ -318,7 +295,6 @@ - False True False Camera @@ -330,7 +306,6 @@ gtk-about - False True False True @@ -341,7 +316,6 @@ Driver - False True False False @@ -351,7 +325,6 @@ Manual - False True False False @@ -365,7 +338,6 @@ Supported Cameras - False True False False @@ -389,10 +361,8 @@ False - False True False - False True @@ -420,11 +390,9 @@ - False True False View the full list of camera settings - False Settings True gtk-properties @@ -438,10 +406,8 @@ - False True False - False True @@ -450,11 +416,9 @@ - False True False Capture an image - False Capture True capture @@ -467,11 +431,9 @@ - False True False Continuous capture preview - False Preview True preview @@ -484,10 +446,8 @@ - False True False - False 200 @@ -504,12 +464,10 @@ - False True False Attempt to cancel the currently executing camera operation - False Cancel True gtk-cancel @@ -532,12 +490,10 @@ - False True False Shrink the display of the image by one factor - False Zoom Out True gtk-zoom-out @@ -550,12 +506,10 @@ - False True False Enlarge the display of the image by one factor - False Zoom In True gtk-zoom-in @@ -568,12 +522,10 @@ - False True False Resize the image to automatically fit the available window real estate - False Best Fit True gtk-zoom-fit @@ -586,12 +538,10 @@ - False True False Display the image with its native pixel size - False Normal True gtk-zoom-100 @@ -613,11 +563,9 @@ - False True False Switch to fullscreen display mode - False Full Screen True gtk-fullscreen @@ -681,39 +629,10 @@ True True - - True - True - - - True - False - queue - etched-in - - - - - - - - False - True - + - - True - True - etched-in - - - - - - True - True - + @@ -737,7 +656,6 @@ gtk-open - False True False True @@ -747,7 +665,6 @@ - False True False Open with @@ -755,7 +672,6 @@ - False True False @@ -763,7 +679,6 @@ gtk-delete - False True False True diff -Nru entangle-0.5.1/src/frontend/entangle-control-panel.c entangle-0.5.2/src/frontend/entangle-control-panel.c --- entangle-0.5.1/src/frontend/entangle-control-panel.c 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/frontend/entangle-control-panel.c 2013-08-17 18:27:47.000000000 +0000 @@ -98,14 +98,13 @@ { GtkWidget *widget = GTK_WIDGET(data); gchar *text; - gdk_threads_enter(); + g_object_get(object, "value", &text, NULL); if (GTK_IS_LABEL(widget)) gtk_label_set_text(GTK_LABEL(widget), text); else gtk_entry_set_text(GTK_ENTRY(widget), text); g_free(text); - gdk_threads_leave(); } @@ -123,9 +122,7 @@ text = gtk_entry_get_text(GTK_ENTRY(widget)); ENTANGLE_DEBUG("entry [%s]", text); - gdk_threads_leave(); g_object_set(control, "value", text, NULL); - gdk_threads_enter(); entangle_camera_save_controls_async(priv->camera, NULL, @@ -141,7 +138,6 @@ GtkWidget *widget = GTK_WIDGET(data); gfloat val; - gdk_threads_enter(); g_object_get(object, "value", &val, NULL); if (GTK_IS_LABEL(widget)) { gchar *text = g_strdup_printf("%0.02f", val); @@ -150,7 +146,6 @@ } else { gtk_range_set_value(GTK_RANGE(widget), val); } - gdk_threads_leave(); } @@ -166,9 +161,7 @@ EntangleControlPanelPrivate *priv = panel->priv; ENTANGLE_DEBUG("range [%lf]", value); - gdk_threads_leave(); g_object_set(control, "value", (float)value, NULL); - gdk_threads_enter(); entangle_camera_save_controls_async(priv->camera, NULL, @@ -184,7 +177,6 @@ GtkWidget *widget = GTK_WIDGET(data); gchar *text; - gdk_threads_enter(); g_object_get(object, "value", &text, NULL); if (GTK_IS_LABEL(widget)) { @@ -198,7 +190,6 @@ gtk_combo_box_set_active(GTK_COMBO_BOX(widget), active); } g_free(text); - gdk_threads_leave(); } @@ -218,9 +209,7 @@ gtk_tree_model_get(model, &iter, 0, &text, -1); ENTANGLE_DEBUG("combo [%s]", text); - gdk_threads_leave(); g_object_set(control, "value", text, NULL); - gdk_threads_enter(); g_free(text); @@ -238,14 +227,12 @@ GtkWidget *widget = GTK_WIDGET(data); gboolean state; - gdk_threads_enter(); g_object_get(object, "value", &state, NULL); if (GTK_IS_LABEL(widget)) gtk_label_set_text(GTK_LABEL(widget), state ? _("On") : _("Off")); else gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), state); - gdk_threads_leave(); } @@ -261,9 +248,7 @@ active = gtk_toggle_button_get_active(widget); ENTANGLE_DEBUG("toggle [%d]", active); - gdk_threads_leave(); g_object_set(control, "value", active, NULL); - gdk_threads_enter(); entangle_camera_save_controls_async(priv->camera, NULL, @@ -465,7 +450,11 @@ int i; GtkWidget *frame = gtk_expander_new(entangle_control_get_label(ENTANGLE_CONTROL(grp))); +#if GTK_CHECK_VERSION(3, 2, 0) + GtkWidget *subbox = gtk_grid_new(); +#else GtkWidget *subbox = gtk_table_new(entangle_control_group_count(grp), 2, FALSE); +#endif gtk_container_add(GTK_CONTAINER(frame), subbox); gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 0); @@ -496,7 +485,6 @@ int date; gchar *text; - value = gtk_entry_new(); g_object_get(control, "value", &date, NULL); text = g_strdup_printf("%d", date); value = gtk_label_new(text); @@ -544,8 +532,13 @@ gtk_misc_set_alignment(GTK_MISC(value), 0, 0); gtk_label_set_ellipsize(GTK_LABEL(label), PANGO_ELLIPSIZE_END); gtk_widget_set_tooltip_text(label, entangle_control_get_info(control)); +#if GTK_CHECK_VERSION(3, 2, 0) + gtk_grid_attach(GTK_GRID(subbox), label, 0, i, 1, 1); + gtk_grid_attach(GTK_GRID(subbox), value, 1, i, 1, 1); +#else gtk_table_attach(GTK_TABLE(subbox), label, 0, 1, i, i+1, GTK_EXPAND|GTK_FILL, GTK_EXPAND, 3, 3); gtk_table_attach(GTK_TABLE(subbox), value, 1, 2, i, i+1, GTK_FILL, GTK_EXPAND, 3, 3); +#endif } } diff -Nru entangle-0.5.1/src/frontend/entangle-image-display.c entangle-0.5.2/src/frontend/entangle-image-display.c --- entangle-0.5.1/src/frontend/entangle-image-display.c 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/frontend/entangle-image-display.c 2013-08-17 18:27:47.000000000 +0000 @@ -82,7 +82,7 @@ pw = gdk_pixbuf_get_width(pixbuf); ph = gdk_pixbuf_get_height(pixbuf); - priv->pixmap = cairo_image_surface_create(CAIRO_FORMAT_RGB24, pw, ph); + priv->pixmap = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, pw, ph); /* Paint the stack of images - the first one * is completely opaque. Others are layers @@ -1025,6 +1025,17 @@ } +gboolean entangle_image_display_get_loaded(EntangleImageDisplay *display) +{ + EntangleImage *image = entangle_image_display_get_image(display); + GdkPixbuf *pixbuf = NULL; + + if (image) + pixbuf = entangle_image_get_pixbuf(image); + + return pixbuf != NULL; +} + /* * Local variables: diff -Nru entangle-0.5.1/src/frontend/entangle-image-display.h entangle-0.5.2/src/frontend/entangle-image-display.h --- entangle-0.5.1/src/frontend/entangle-image-display.h 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/frontend/entangle-image-display.h 2013-08-17 18:27:47.000000000 +0000 @@ -91,6 +91,8 @@ gboolean enabled); gboolean entangle_image_display_get_focus_point(EntangleImageDisplay *display); +gboolean entangle_image_display_get_loaded(EntangleImageDisplay *display); + typedef enum { ENTANGLE_IMAGE_DISPLAY_GRID_NONE, ENTANGLE_IMAGE_DISPLAY_GRID_CENTER_LINES, diff -Nru entangle-0.5.1/src/frontend/entangle-image-histogram.c entangle-0.5.2/src/frontend/entangle-image-histogram.c --- entangle-0.5.1/src/frontend/entangle-image-histogram.c 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/frontend/entangle-image-histogram.c 2013-08-17 18:27:47.000000000 +0000 @@ -31,8 +31,11 @@ (G_TYPE_INSTANCE_GET_PRIVATE((obj), ENTANGLE_TYPE_IMAGE_HISTOGRAM, EntangleImageHistogramPrivate)) struct _EntangleImageHistogramPrivate { - double freq[255]; + double freq_red[255]; + double freq_green[255]; + double freq_blue[255]; gboolean hasFreq; + gboolean linear; gulong imageNotifyID; EntangleImage *image; }; @@ -56,7 +59,10 @@ if (priv->image) pixbuf = entangle_image_get_pixbuf(priv->image); - memset(priv->freq, 0, sizeof(priv->freq)); + + memset(priv->freq_red, 0, sizeof(priv->freq_red)); + memset(priv->freq_green, 0, sizeof(priv->freq_green)); + memset(priv->freq_blue, 0, sizeof(priv->freq_blue)); if (!pixbuf) { priv->hasFreq = FALSE; @@ -69,22 +75,23 @@ guint stride = gdk_pixbuf_get_rowstride(pixbuf); int x, y; - for (y = 0 ; y < h ; y++) { guchar *pixel = pixels; for (x = 0 ; x < w ; x++) { - double level = round(pixel[0] + pixel[1] + pixel[2])/3.0; - priv->freq[((int)level) & 0xff]++; + guchar level_red = pixel[0]; + guchar level_green = pixel[1]; + guchar level_blue = pixel[2]; + + priv->freq_red[level_red]++; + priv->freq_green[level_green]++; + priv->freq_blue[level_blue]++; + pixel+=3; } pixels += stride; } - for (x = 0 ; x < 255 ; x++) { - priv->freq[x] = DOUBLE_EQUAL(priv->freq[x], 0.0) ? 0.0 : log(priv->freq[x]); - } - priv->hasFreq = TRUE; } @@ -144,6 +151,34 @@ } +static void entangle_image_histogram_draw_line(cairo_t *cr, float from_x, float from_y, float to_x, float to_y) +{ + cairo_move_to(cr, from_x, from_y); + cairo_line_to(cr, to_x, to_y); +} + + +static void entangle_image_histogram_draw_grid(cairo_t *cr, const float width, const float height) +{ + for (int k = 1; k < 4; k++) { + entangle_image_histogram_draw_line(cr, k/(float)4 * width, 0, k/(float)4 * width, height); + cairo_stroke(cr); + entangle_image_histogram_draw_line(cr, 0, k/(float)4 * height, width, k/(float)4 * height); + cairo_stroke(cr); + } +} + + +static double entangle_image_histogram_calculate_value(double d, gboolean l) +{ + if (!l) { + return DOUBLE_EQUAL(d, 0.0) ? 0.0 : log(d); + } + + return d; +} + + static gboolean entangle_image_histogram_draw(GtkWidget *widget, cairo_t *cr) { g_return_val_if_fail(ENTANGLE_IS_IMAGE_HISTOGRAM(widget), FALSE); @@ -157,33 +192,92 @@ ww = gdk_window_get_width(gtk_widget_get_window(widget)); wh = gdk_window_get_height(gtk_widget_get_window(widget)); + cairo_save(cr); + /* We need to fill the background first */ - cairo_set_source_rgb(cr, 0.0, 0.0, 0.0); + cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 1.0); cairo_rectangle(cr, 0, 0, ww, wh); cairo_fill(cr); + /* Draw a grid */ + cairo_save(cr); + cairo_set_line_width(cr, 0.4); + cairo_set_source_rgba(cr, 0.4, 0.4, 0.4, 0.2); + entangle_image_histogram_draw_grid(cr, ww, wh); + cairo_restore(cr); + if (priv->hasFreq) { for (idx = 0 ; idx < 255 ; idx++) { - if (priv->freq[idx] > peak) - peak = priv->freq[idx]; + double rv = entangle_image_histogram_calculate_value(priv->freq_red[idx], priv->linear); + double gv = entangle_image_histogram_calculate_value(priv->freq_green[idx], priv->linear); + double bv = entangle_image_histogram_calculate_value(priv->freq_blue[idx], priv->linear); + + if (rv > peak) + peak = rv; + if (gv > peak) + peak = gv; + if (bv > peak) + peak = bv; } cairo_set_line_width(cr, 3); cairo_set_line_cap(cr, CAIRO_LINE_CAP_ROUND); - cairo_set_source_rgba(cr, 0.3, 0.3, 0.3, 1.0); + cairo_set_operator(cr, CAIRO_OPERATOR_ADD); /* Draw the actual histogram */ + + /* Red channel */ + cairo_save(cr); + cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.7); + cairo_move_to(cr, 0, wh); + + for (idx = 0 ; idx < 255 ; idx++) { + double rv = entangle_image_histogram_calculate_value(priv->freq_red[idx], priv->linear); + double x = (double)ww * (double)idx / 255.0; + double y = (double)(wh - 2) * (double)rv / peak; + + cairo_line_to(cr, x, wh - y); + } + cairo_line_to(cr, ww, wh); + cairo_line_to(cr, 0, wh); + cairo_fill(cr); + cairo_restore(cr); + + /* Green channel */ + cairo_save(cr); + cairo_set_source_rgba(cr, 0.0, 1.0, 0.0, 0.7); + cairo_move_to(cr, 0, wh); + + for (idx = 0 ; idx < 255 ; idx++) { + double gv = entangle_image_histogram_calculate_value(priv->freq_green[idx], priv->linear); + double x = (double)ww * (double)idx / 255.0; + double y = (double)(wh - 2) * (double)gv / peak; + + cairo_line_to(cr, x, wh - y); + } + cairo_line_to(cr, ww, wh); + cairo_line_to(cr, 0, wh); + cairo_fill(cr); + cairo_restore(cr); + + /* Blue channel */ + cairo_save(cr); + cairo_set_source_rgba(cr, 0.0, 0.0, 1.0, 0.7); cairo_move_to(cr, 0, wh); for (idx = 0 ; idx < 255 ; idx++) { + double bv = entangle_image_histogram_calculate_value(priv->freq_blue[idx], priv->linear); double x = (double)ww * (double)idx / 255.0; - double y = (double)(wh - 2) * (double)priv->freq[idx] / peak; + double y = (double)(wh - 2) * (double)bv / peak; cairo_line_to(cr, x, wh - y); } cairo_line_to(cr, ww, wh); cairo_line_to(cr, 0, wh); cairo_fill(cr); + cairo_restore(cr); } + cairo_restore(cr); + return TRUE; } @@ -306,6 +400,27 @@ } +void entangle_image_histogram_set_histogram_linear(EntangleImageHistogram *histogram, gboolean linear) +{ + g_return_if_fail(ENTANGLE_IS_IMAGE_HISTOGRAM(histogram)); + + EntangleImageHistogramPrivate *priv = histogram->priv; + + priv->linear = linear; + + gtk_widget_queue_draw(GTK_WIDGET(histogram)); +} + + +gboolean entangle_image_histogram_get_histogram_linear(EntangleImageHistogram *histogram) +{ + g_return_val_if_fail(ENTANGLE_IS_IMAGE_HISTOGRAM(histogram), FALSE); + + EntangleImageHistogramPrivate *priv = histogram->priv; + + return priv->linear; +} + /* * Local variables: * c-indent-level: 4 diff -Nru entangle-0.5.1/src/frontend/entangle-image-histogram.h entangle-0.5.2/src/frontend/entangle-image-histogram.h --- entangle-0.5.1/src/frontend/entangle-image-histogram.h 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/frontend/entangle-image-histogram.h 2013-08-17 18:27:47.000000000 +0000 @@ -60,6 +60,10 @@ EntangleImage *image); EntangleImage *entangle_image_histogram_get_image(EntangleImageHistogram *histogram); +void entangle_image_histogram_set_histogram_linear(EntangleImageHistogram *histogram, + gboolean linear); +gboolean entangle_image_histogram_get_histogram_linear(EntangleImageHistogram *histogram); + G_END_DECLS #endif /* __ENTANGLE_IMAGE_HISTOGRAM_H__ */ diff -Nru entangle-0.5.1/src/frontend/entangle-image-popup.c entangle-0.5.2/src/frontend/entangle-image-popup.c --- entangle-0.5.1/src/frontend/entangle-image-popup.c 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/frontend/entangle-image-popup.c 2013-08-17 18:27:47.000000000 +0000 @@ -267,8 +267,6 @@ EntangleImagePopupPrivate *priv = popup->priv; GtkWidget *win = GTK_WIDGET(gtk_builder_get_object(priv->builder, "image-popup")); - win = GTK_WIDGET(gtk_builder_get_object(priv->builder, "image-popup")); - gtk_widget_realize(win); gtk_window_set_transient_for(GTK_WINDOW(win), parent); @@ -307,8 +305,6 @@ GtkWidget *win = GTK_WIDGET(gtk_builder_get_object(priv->builder, "image-popup")); GdkCursor *null_cursor = gdk_cursor_new(GDK_BLANK_CURSOR); - win = GTK_WIDGET(gtk_builder_get_object(priv->builder, "image-popup")); - gtk_widget_realize(win); gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(win)), diff -Nru entangle-0.5.1/src/frontend/entangle-image-statusbar.c entangle-0.5.2/src/frontend/entangle-image-statusbar.c --- entangle-0.5.1/src/frontend/entangle-image-statusbar.c 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/frontend/entangle-image-statusbar.c 2013-08-17 18:27:47.000000000 +0000 @@ -191,29 +191,44 @@ if (metadata) { gint nom, den; - glong fnum; + gint fnumn, fnumd; + gdouble fnum; guint isonum; gdouble focalnum; - gexiv2_metadata_get_exposure_time(metadata, &nom, &den); - if (den == 10) - shutter = g_strdup_printf("%0.0lf secs", (double)nom/10.0); - else if (nom == 10) - shutter = g_strdup_printf("1/%0.0lf secs", (double)den/10.0); - else - shutter = g_strdup_printf("%0.0lf/%0.0lf secs", (double)nom/10.0, (double)den/10.0); - - fnum = gexiv2_metadata_get_exif_tag_long(metadata, "Exif.Photo.FNumber"); - if (!fnum) - fnum = gexiv2_metadata_get_exif_tag_long(metadata, "Exit.Photo.Aperture"); - //fnum = gexiv2_metadata_get_fnumber(metadata); - aperture = g_strdup_printf("f/%ld", fnum); - - isonum = gexiv2_metadata_get_iso_speed(metadata); - iso = g_strdup_printf("ISO %d", isonum); - - focalnum = gexiv2_metadata_get_focal_length(metadata); - focal = g_strdup_printf("%0.0lf mm", focalnum); + if (gexiv2_metadata_has_tag(metadata, "Exif.Photo.ExposureTime")) { + gexiv2_metadata_get_exif_tag_rational(metadata, "Exif.Photo.ExposureTime", &nom, &den); + if (den == 10) + shutter = g_strdup_printf("%0.1lf secs", (double)nom/10.0); + else if (nom == 10) + shutter = g_strdup_printf("1/%0.0lf secs", (double)den/10.0); + else + shutter = g_strdup_printf("%d/%d secs", nom, den); + } + + if ((gexiv2_metadata_has_tag(metadata, "Exif.Photo.FNumber") && + gexiv2_metadata_get_exif_tag_rational(metadata, "Exif.Photo.FNumber", &fnumn, &fnumd)) || + (gexiv2_metadata_has_tag(metadata, "Exif.Photo.Aperture") && + gexiv2_metadata_get_exif_tag_rational(metadata, "Exif.Photo.Aperture", &fnumn, &fnumd))) { + fnum = (double)fnumn/(double)fnumd; + if (fnum < 10.0) + aperture = g_strdup_printf("f/%1.1f", fnum); + else + aperture = g_strdup_printf("f/%2.0f", fnum); + } + + if (gexiv2_metadata_has_tag(metadata, "Exif.Photo.ISOSpeedRatings")) { + isonum = gexiv2_metadata_get_exif_tag_long(metadata, "Exif.Photo.ISOSpeedRatings"); + iso = g_strdup_printf("ISO %d", isonum); + } + + if (gexiv2_metadata_has_tag(metadata, "Exif.Photo.FocalLength")) { + gexiv2_metadata_get_exif_tag_rational(metadata, "Exif.Photo.FocalLength", &nom, &den); + if (den > 0.0001) { + focalnum = (nom / den); + focal = g_strdup_printf("%0.0lf mm", focalnum); + } + } dimensions = g_strdup_printf("%d x %d", gexiv2_metadata_get_pixel_width(metadata), diff -Nru entangle-0.5.1/src/frontend/entangle-preferences-display.c entangle-0.5.2/src/frontend/entangle-preferences-display.c --- entangle-0.5.1/src/frontend/entangle-preferences-display.c 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/frontend/entangle-preferences-display.c 2013-08-17 18:27:47.000000000 +0000 @@ -69,6 +69,7 @@ void do_interface_auto_connect_toggled(GtkToggleButton *src, EntanglePreferencesDisplay *display); void do_interface_screen_blank_toggled(GtkToggleButton *src, EntanglePreferencesDisplay *display); +void do_interface_histogram_linear_toggled(GtkToggleButton *src, EntanglePreferencesDisplay *display); void do_capture_filename_pattern_changed(GtkEntry *src, EntanglePreferencesDisplay *display); void do_capture_continuous_preview_toggled(GtkToggleButton *src, EntanglePreferencesDisplay *display); @@ -194,6 +195,15 @@ if (newvalue != oldvalue) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tmp), newvalue); + } else if (strcmp(spec->name, "interface-histogram-linear") == 0) { + gboolean newvalue; + gboolean oldvalue; + + g_object_get(object, spec->name, &newvalue, NULL); + oldvalue = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(tmp)); + + if (newvalue != oldvalue) + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tmp), newvalue); } else if (strcmp(spec->name, "capture-filename-pattern") == 0) { gchar *newvalue; const gchar *oldvalue; @@ -402,6 +412,9 @@ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tmp), entangle_preferences_interface_get_auto_connect(prefs)); tmp = GTK_WIDGET(gtk_builder_get_object(priv->builder, "interface-screen-blank")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tmp), entangle_preferences_interface_get_screen_blank(prefs)); + tmp = GTK_WIDGET(gtk_builder_get_object(priv->builder, "interface-histogram-linear")); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tmp), + entangle_preferences_interface_get_histogram_linear(prefs)); tmp = GTK_WIDGET(gtk_builder_get_object(priv->builder, "capture-filename-pattern")); gtk_entry_set_text(GTK_ENTRY(tmp), entangle_preferences_capture_get_filename_pattern(prefs)); @@ -688,6 +701,18 @@ } +void do_interface_histogram_linear_toggled(GtkToggleButton *src, EntanglePreferencesDisplay *preferences) +{ + g_return_if_fail(ENTANGLE_IS_PREFERENCES_DISPLAY(preferences)); + + EntanglePreferencesDisplayPrivate *priv = preferences->priv; + EntanglePreferences *prefs = entangle_application_get_preferences(priv->application); + gboolean enabled = gtk_toggle_button_get_active(src); + + entangle_preferences_interface_set_histogram_linear(prefs, enabled); +} + + void do_capture_delete_file_toggled(GtkToggleButton *src, EntanglePreferencesDisplay *preferences) { g_return_if_fail(ENTANGLE_IS_PREFERENCES_DISPLAY(preferences)); diff -Nru entangle-0.5.1/src/frontend/entangle-preferences.xml entangle-0.5.2/src/frontend/entangle-preferences.xml --- entangle-0.5.1/src/frontend/entangle-preferences.xml 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/frontend/entangle-preferences.xml 2013-08-17 18:27:47.000000000 +0000 @@ -636,6 +636,22 @@ 2 + + + Show linear histogram + True + True + False + 0 + True + + + + 2 + 2 + 3 + + True diff -Nru entangle-0.5.1/src/frontend/entangle-session-browser.c entangle-0.5.2/src/frontend/entangle-session-browser.c --- entangle-0.5.1/src/frontend/entangle-session-browser.c 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/frontend/entangle-session-browser.c 2013-08-17 18:27:47.000000000 +0000 @@ -1027,7 +1027,7 @@ rect.width = item_area->width + priv->item_padding * 2; rect.height = item_area->height + priv->item_padding * 2; - if (priv->bin_window) + if (priv->bin_window && item_area->width != -1 && item_area->height != -1) gdk_window_invalidate_rect(priv->bin_window, &rect, TRUE); } diff -Nru entangle-0.5.1/src/icons/128x128/Makefile.in entangle-0.5.2/src/icons/128x128/Makefile.in --- entangle-0.5.1/src/icons/128x128/Makefile.in 2013-03-12 21:24:38.000000000 +0000 +++ entangle-0.5.2/src/icons/128x128/Makefile.in 2013-08-17 18:27:59.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 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,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/icons/128x128 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/entangle-compile-warnings.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ @@ -79,13 +107,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;; \ @@ -93,9 +122,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) @@ -375,14 +424,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 +451,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 +473,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 +485,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 +498,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 +673,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 entangle-0.5.1/src/icons/128x128/actions/Makefile.in entangle-0.5.2/src/icons/128x128/actions/Makefile.in --- entangle-0.5.1/src/icons/128x128/actions/Makefile.in 2013-03-12 21:24:38.000000000 +0000 +++ entangle-0.5.2/src/icons/128x128/actions/Makefile.in 2013-08-17 18:27:59.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 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,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/icons/128x128/actions -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/entangle-compile-warnings.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ @@ -114,6 +142,7 @@ } am__installdirs = "$(DESTDIR)$(icondir)" DATA = $(icon_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -381,11 +410,9 @@ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +553,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-iconDATA 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-iconDATA + 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-iconDATA 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-iconDATA -include $(top_srcdir)/git.mk diff -Nru entangle-0.5.1/src/icons/16x16/Makefile.in entangle-0.5.2/src/icons/16x16/Makefile.in --- entangle-0.5.1/src/icons/16x16/Makefile.in 2013-03-12 21:24:38.000000000 +0000 +++ entangle-0.5.2/src/icons/16x16/Makefile.in 2013-08-17 18:27:59.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 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,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/icons/16x16 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/entangle-compile-warnings.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ @@ -79,13 +107,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;; \ @@ -93,9 +122,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) @@ -375,14 +424,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 +451,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 +473,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 +485,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 +498,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 +673,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 entangle-0.5.1/src/icons/16x16/actions/Makefile.in entangle-0.5.2/src/icons/16x16/actions/Makefile.in --- entangle-0.5.1/src/icons/16x16/actions/Makefile.in 2013-03-12 21:24:38.000000000 +0000 +++ entangle-0.5.2/src/icons/16x16/actions/Makefile.in 2013-08-17 18:27:59.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 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,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/icons/16x16/actions -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/entangle-compile-warnings.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ @@ -114,6 +142,7 @@ } am__installdirs = "$(DESTDIR)$(icondir)" DATA = $(icon_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -381,11 +410,9 @@ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +553,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-iconDATA 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-iconDATA + 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-iconDATA 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-iconDATA -include $(top_srcdir)/git.mk diff -Nru entangle-0.5.1/src/icons/22x22/Makefile.in entangle-0.5.2/src/icons/22x22/Makefile.in --- entangle-0.5.1/src/icons/22x22/Makefile.in 2013-03-12 21:24:38.000000000 +0000 +++ entangle-0.5.2/src/icons/22x22/Makefile.in 2013-08-17 18:27:59.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 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,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/icons/22x22 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/entangle-compile-warnings.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ @@ -79,13 +107,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;; \ @@ -93,9 +122,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) @@ -375,14 +424,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 +451,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 +473,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 +485,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 +498,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 +673,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 entangle-0.5.1/src/icons/22x22/actions/Makefile.in entangle-0.5.2/src/icons/22x22/actions/Makefile.in --- entangle-0.5.1/src/icons/22x22/actions/Makefile.in 2013-03-12 21:24:38.000000000 +0000 +++ entangle-0.5.2/src/icons/22x22/actions/Makefile.in 2013-08-17 18:27:59.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 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,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/icons/22x22/actions -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/entangle-compile-warnings.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ @@ -114,6 +142,7 @@ } am__installdirs = "$(DESTDIR)$(icondir)" DATA = $(icon_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -381,11 +410,9 @@ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +553,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-iconDATA 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-iconDATA + 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-iconDATA 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-iconDATA -include $(top_srcdir)/git.mk diff -Nru entangle-0.5.1/src/icons/32x32/Makefile.in entangle-0.5.2/src/icons/32x32/Makefile.in --- entangle-0.5.1/src/icons/32x32/Makefile.in 2013-03-12 21:24:38.000000000 +0000 +++ entangle-0.5.2/src/icons/32x32/Makefile.in 2013-08-17 18:27:59.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 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,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/icons/32x32 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/entangle-compile-warnings.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ @@ -79,13 +107,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;; \ @@ -93,9 +122,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) @@ -375,14 +424,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 +451,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 +473,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 +485,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 +498,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 +673,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 entangle-0.5.1/src/icons/32x32/actions/Makefile.in entangle-0.5.2/src/icons/32x32/actions/Makefile.in --- entangle-0.5.1/src/icons/32x32/actions/Makefile.in 2013-03-12 21:24:38.000000000 +0000 +++ entangle-0.5.2/src/icons/32x32/actions/Makefile.in 2013-08-17 18:27:59.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 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,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/icons/32x32/actions -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/entangle-compile-warnings.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ @@ -114,6 +142,7 @@ } am__installdirs = "$(DESTDIR)$(icondir)" DATA = $(icon_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -381,11 +410,9 @@ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +553,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-iconDATA 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-iconDATA + 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-iconDATA 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-iconDATA -include $(top_srcdir)/git.mk diff -Nru entangle-0.5.1/src/icons/48x48/Makefile.in entangle-0.5.2/src/icons/48x48/Makefile.in --- entangle-0.5.1/src/icons/48x48/Makefile.in 2013-03-12 21:24:38.000000000 +0000 +++ entangle-0.5.2/src/icons/48x48/Makefile.in 2013-08-17 18:27:59.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 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,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/icons/48x48 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/entangle-compile-warnings.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ @@ -79,13 +107,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;; \ @@ -93,9 +122,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) @@ -375,14 +424,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 +451,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 +473,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 +485,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 +498,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 +673,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 entangle-0.5.1/src/icons/48x48/actions/Makefile.in entangle-0.5.2/src/icons/48x48/actions/Makefile.in --- entangle-0.5.1/src/icons/48x48/actions/Makefile.in 2013-03-12 21:24:38.000000000 +0000 +++ entangle-0.5.2/src/icons/48x48/actions/Makefile.in 2013-08-17 18:27:59.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 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,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/icons/48x48/actions -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/entangle-compile-warnings.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ @@ -114,6 +142,7 @@ } am__installdirs = "$(DESTDIR)$(icondir)" DATA = $(icon_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -381,11 +410,9 @@ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +553,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-iconDATA 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-iconDATA + 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-iconDATA 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-iconDATA -include $(top_srcdir)/git.mk diff -Nru entangle-0.5.1/src/icons/64x64/Makefile.in entangle-0.5.2/src/icons/64x64/Makefile.in --- entangle-0.5.1/src/icons/64x64/Makefile.in 2013-03-12 21:24:38.000000000 +0000 +++ entangle-0.5.2/src/icons/64x64/Makefile.in 2013-08-17 18:28:00.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 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,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/icons/64x64 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/entangle-compile-warnings.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ @@ -79,13 +107,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;; \ @@ -93,9 +122,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) @@ -375,14 +424,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 +451,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 +473,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 +485,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 +498,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 +673,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 entangle-0.5.1/src/icons/64x64/actions/Makefile.in entangle-0.5.2/src/icons/64x64/actions/Makefile.in --- entangle-0.5.1/src/icons/64x64/actions/Makefile.in 2013-03-12 21:24:38.000000000 +0000 +++ entangle-0.5.2/src/icons/64x64/actions/Makefile.in 2013-08-17 18:28:00.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 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,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/icons/64x64/actions -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/entangle-compile-warnings.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ @@ -114,6 +142,7 @@ } am__installdirs = "$(DESTDIR)$(icondir)" DATA = $(icon_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -381,11 +410,9 @@ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +553,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-iconDATA 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-iconDATA + 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-iconDATA 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-iconDATA -include $(top_srcdir)/git.mk diff -Nru entangle-0.5.1/src/icons/Makefile.in entangle-0.5.2/src/icons/Makefile.in --- entangle-0.5.1/src/icons/Makefile.in 2013-03-12 21:24:38.000000000 +0000 +++ entangle-0.5.2/src/icons/Makefile.in 2013-08-17 18:28:00.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 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,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/icons -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/entangle-compile-warnings.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ @@ -79,13 +107,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;; \ @@ -93,9 +122,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) @@ -375,14 +424,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 +451,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 +473,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 +485,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 +498,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 +673,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 entangle-0.5.1/src/org.entangle-photo.manager.gschema.xml entangle-0.5.2/src/org.entangle-photo.manager.gschema.xml --- entangle-0.5.1/src/org.entangle-photo.manager.gschema.xml 2013-03-12 21:23:35.000000000 +0000 +++ entangle-0.5.2/src/org.entangle-photo.manager.gschema.xml 2013-08-17 18:27:47.000000000 +0000 @@ -37,6 +37,12 @@ Blank screen while capturing images + + false + Show linear histogram + Show linear histogram instead of logarithmic + + [] Plugins @@ -150,6 +156,5 @@ Onion skin Enable image overlay display -