[cheese: 1/2] port cheese to gsettings
- From: Daniel G. Siegel <dgsiegel src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cheese: 1/2] port cheese to gsettings
- Date: Thu, 11 Nov 2010 01:44:53 +0000 (UTC)
commit 25aed01e1623446c960b47110fece9b7acc939b6
Author: daniel g. siegel <dgsiegel gnome org>
Date: Fri Aug 6 17:22:40 2010 +0530
port cheese to gsettings
this commit drops gconf entirely from cheese and uses
gsettings. glib and gio dependency was bumped to 2.26.0
INSTALL | 97 ++-
TODO | 54 +-
autogen.sh | 36 +
configure.ac | 21 +-
data/Makefile.am | 27 +-
data/cheese-actions.ui | 1 -
data/cheese-bugreport.sh | 4 -
data/cheese-prefs.ui | 131 ++-
data/cheese-viewport.json | 2 +-
data/cheese.desktop.in.in | 1 -
data/cheese.schemas.in | 190 ----
data/org.gnome.Cheese.gschema.xml | 136 +++
data/pixmaps/thumbnail-frame.png | Bin 908 -> 482 bytes
help/cs/cs.po | 2 +-
help/zh_CN/zh_CN.po | 41 +-
libcheese/Makefile.am | 2 -
libcheese/cheese-avatar-chooser.c | 34 +-
libcheese/cheese-camera-device-monitor.c | 18 +-
libcheese/cheese-camera-device-monitor.h | 8 +-
libcheese/cheese-camera-device.c | 49 +-
libcheese/cheese-camera-device.h | 6 +-
libcheese/cheese-camera.c | 116 ++-
libcheese/cheese-camera.h | 41 +-
libcheese/cheese-countdown.c | 4 +-
libcheese/cheese-effect.c | 69 +-
libcheese/cheese-effect.h | 17 +-
libcheese/cheese-fileutil.c | 30 +-
libcheese/cheese-fileutil.h | 1 -
libcheese/cheese-gconf.c | 506 ----------
libcheese/cheese-gconf.h | 67 --
libcheese/cheese-gtk.symbols | 2 -
libcheese/cheese-widget-private.h | 4 +-
libcheese/cheese-widget.c | 55 +-
libcheese/cheese-widget.h | 2 +
libcheese/um-crop-area.c | 1049 ++++++++++----------
libcheese/um-crop-area.h | 10 +-
po/LINGUAS | 3 +
po/ar.po | 834 +++++++++-------
po/bg.po | 628 +++++-------
po/ca.po | 84 +-
po/ca valencia po | 71 +-
po/cs.po | 81 +-
po/da.po | 703 +++++++-------
po/el.po | 93 +-
po/en_GB.po | 680 +++++++------
po/es.po | 74 +-
po/et.po | 190 +---
po/eu.po | 672 +++++++------
po/fr.po | 338 +++----
po/gl.po | 58 +-
po/he.po | 53 +-
po/hu.po | 84 +-
po/id.po | 100 +-
po/it.po | 102 +-
po/ja.po | 691 +++++++------
po/kk.po | 551 ++++++++++
po/lt.po | 131 ++--
po/nb.po | 96 +--
po/nl.po | 566 +++++++----
po/nn.po | 781 ++++++++-------
po/pa.po | 76 +-
po/pl.po | 116 ++-
po/pt.po | 684 +++++++------
po/ru.po | 90 +-
po/sk.po | 482 +++++++++
po/sl.po | 54 +-
po/sr.po | 91 +-
po/sr latin po | 91 +-
po/sv.po | 153 ++--
po/ta.po | 68 +-
po/ug.po | 610 ++++++++++++
po/zh_CN.po | 167 ++--
src/Makefile.am | 16 +-
src/cheese-countdown.vala | 26 +-
src/cheese-effects-manager.vala | 27 +-
src/cheese-main.vala | 44 +-
src/cheese-preferences.vala | 112 ++-
src/cheese-window.vala | 407 ++++++---
src/thumbview/cheese-gconf.c | 506 ----------
src/thumbview/cheese-gconf.h | 67 --
src/thumbview/cheese-thumb-view.c | 6 +-
.../{eog-thumbnail.c => cheese-thumbnail.c} | 99 +-
.../{eog-thumbnail.h => cheese-thumbnail.h} | 25 +-
src/vapi/cheese-common.vapi | 40 +-
src/vapi/clutter-tablelayout.vapi | 45 +
tests/cheese-test-widget.c | 2 +-
86 files changed, 7819 insertions(+), 6782 deletions(-)
---
diff --git a/INSTALL b/INSTALL
index 2550dab..7d1c323 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,8 +4,10 @@ Installation Instructions
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
2006, 2007, 2008, 2009 Free Software Foundation, Inc.
- This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+ Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
Basic Installation
==================
@@ -13,7 +15,11 @@ Basic Installation
Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package. Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below. The lack of an optional feature in a given package is not
+necessarily a bug. More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -42,7 +48,7 @@ may remove or edit it.
you want to change it or regenerate `configure' using a newer version
of `autoconf'.
-The simplest way to compile this package is:
+ The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system.
@@ -53,12 +59,22 @@ The simplest way to compile this package is:
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
- the package.
+ the package, generally using the just-built uninstalled binaries.
4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
+ documentation. When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the `make install' phase executed with root
+ privileges.
+
+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything. Running this target as a
+ regular user, particularly if the prior `make install' required
+ root privileges, verifies that the installation completed
+ correctly.
+
+ 6. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
@@ -67,8 +83,15 @@ The simplest way to compile this package is:
all sorts of other programs in order to regenerate files that came
with the distribution.
- 6. Often, you can also type `make uninstall' to remove the installed
- files again.
+ 7. Often, you can also type `make uninstall' to remove the installed
+ files again. In practice, not all packages have tested that
+ uninstallation works correctly, even though it is required by the
+ GNU Coding Standards.
+
+ 8. Some packages, particularly those that use Automake, provide `make
+ distcheck', which can by used by developers to test that all other
+ targets like `make install' and `make uninstall' work correctly.
+ This target is generally not run by end users.
Compilers and Options
=====================
@@ -93,7 +116,8 @@ same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'. This
+is known as a "VPATH" build.
With a non-GNU `make', it is safer to compile the package for one
architecture at a time in the source code directory. After you have
@@ -120,7 +144,8 @@ Installation Names
By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
@@ -131,15 +156,46 @@ Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them. In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+ The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+ The first method involves providing an override variable for each
+affected directory. For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'. Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated. The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the `DESTDIR' variable. For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names. The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters. On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-Optional Features
-=================
-
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -152,6 +208,13 @@ find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
+ Some packages offer the ability to configure how verbose the
+execution of `make' will be. For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
Particular systems
==================
@@ -288,7 +351,7 @@ operates.
`configure' can determine that directory automatically.
`--prefix=DIR'
- Use DIR as the installation prefix. *Note Installation Names::
+ Use DIR as the installation prefix. *note Installation Names::
for more details, including other options available for fine-tuning
the installation locations.
diff --git a/TODO b/TODO
index 9ef6116..9cf4576 100644
--- a/TODO
+++ b/TODO
@@ -2,50 +2,10 @@ please fix me before 3.0
8 show a throbber when doing something which could take some time, e.g.
changing effects, loading webcam, starting recording video
-7 while the webcam is loading, do not allow to take a picture, access
- preferences etc.
-7 improve video recording (doesnt work here atm)
-6 move to gsettings
-6 startup time is till quite long
-5 fix effects preview layout in fullscreen
-5 remove all warnings when compiling
-3 streamline menu items
-3 beautify effects preview, e.g. only a thin white border
-? move to gapplication
-? move to gtk3
-
-NOTES, particularly about "show a throbber" and startup time
-
-Who's taking so much time at cheese startup?
-- cheese_camera_connect_effect_texture
-
-That's the most expensive thing we do, it takes a rough 50% (maybe more)
-of startup time, particularly link_many for each effect is quite
-expensive because it has to match colorspace caps (but in general, gst
-linking is slow).
-
-Can it be avoided? I doubt so[1]. Can it be postponed? definitely.
-
-There's no reason to link all the effects at startup, the
-highest priority thing at startup is show the window and put an image
-into it (or if the camera preview takes some time to show up at least
-show something moving like a throbber as we always did). The effects
-section of the pipeline can be isolated with a valve,
-meanwhile the main pipeline can be started, when the effects are ready
-we can connect them. Ideally given they all have a valve we could
-connect them one at the time and show a throbber for each one. So when
-the user clicks on effect he can see that they are progressively
-loading (or if it clicks on effects when they are ready he won't notice
-the loading thing at all).
-
-Obviously all this stuff has to be done async so that the UI doesn't
-ever block waiting for each task to complete. This could be done with a
-separate thread like we did or taking advantage of gstreamer async
-facilities (GstBus, GstMessages) or, probably, with a mix of the two.
-
-1. gst_element_link_many is quite slow, a good amount of performance can
-be gained using _link_pads or _link_pads_full.
-The latter, from 0.10.30, can avoid checking if the elements are in the
-same bin if we already know they are (and we know it, we just called
-add_many) or it can avoid caps matching checks if we already know that
-caps are compatible.
+8 drop mx table layout
+ * add a 1px white border around previews
+7 improve video recording, see bug #564957
+6 merge gsettings branch on master
+? add nautilus-sendto as a sharing possibility to the context menu of each item
+? remove dbus?
+? save exif data to photos
diff --git a/autogen.sh b/autogen.sh
index 8baf22a..f160d03 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,6 +5,7 @@ srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
PKG_NAME="cheese"
+REQUIRED_VALA_VERSION=0.9.2
(test -f $srcdir/src/cheese-main.vala) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
@@ -17,6 +18,41 @@ which gnome-autogen.sh || {
exit 1
}
+# Usage:
+# compare_versions MIN_VERSION ACTUAL_VERSION
+# returns true if ACTUAL_VERSION >= MIN_VERSION
+compare_versions() {
+ ch_min_version=$1
+ ch_actual_version=$2
+ ch_status=0
+ IFS="${IFS= }"; ch_save_IFS="$IFS"; IFS="."
+ set $ch_actual_version
+ for ch_min in $ch_min_version; do
+ ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes
+ if [ -z "$ch_min" ]; then break; fi
+ if [ -z "$ch_cur" ]; then ch_status=1; break; fi
+ if [ $ch_cur -gt $ch_min ]; then break; fi
+ if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi
+ done
+ IFS="$ch_save_IFS"
+ return $ch_status
+}
+
+which valac || {
+ echo "**Error**: You must have valac >= $REQUIRED_VALA_VERSION installed to build $PKG_NAME"
+ exit 1
+}
+
+# Vala version check
+test -z "$VALAC" && VALAC=valac
+VALA_VERSION=`$VALAC --version | cut -d" " -f2`
+echo $VALA_VERSION
+
+if ! compare_versions $REQUIRED_VALA_VERSION $VALA_VERSION; then
+ echo "**Error**: You must have valac >= $REQUIRED_VALA_VERSION installed to build $PKG_NAME, you have $VALA_VERSION"
+ exit 1
+fi
+
gtkdocize || exit 1
REQUIRED_AUTOCONF_VERSION=2.57
diff --git a/configure.ac b/configure.ac
index 8a86c6d..34dcefa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,13 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT(cheese, 2.31.1)
+AC_INIT(cheese, 2.91.2)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
AM_CONFIG_HEADER(cheese-config.h)
AM_MAINTAINER_MODE
-AM_PROG_VALAC([0.8.0])
+AM_PROG_VALAC([0.9.2])
dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
@@ -75,25 +75,24 @@ GNOME_DOC_INIT
# Check required libraries
#*******************************************************************************
-GLIB_REQUIRED=2.16.0
+GLIB_REQUIRED=2.26.0
GOBJECT_REQUIRED=2.12.0
-GIO_REQUIRED=2.16.0
+GIO_REQUIRED=2.26.0
GTK_REQUIRED=2.19.1
GDK_REQUIRED=2.14.0
LIBGNOMEDESKTOP_REQUIRED=2.26.0
-GCONF_REQUIRED=2.16.0
GSTREAMER_REQUIRED=0.10.23
CAIRO_REQUIRED=1.4.0
DBUS_REQUIRED=1.0
DBUS_GLIB_REQUIRED=0.7
PANGOCAIRO_REQUIRED=1.18.0
LIBRSVG_REQUIRED=2.18.0
-CLUTTER_REQUIRED=1.0
+CLUTTER_REQUIRED=1.4
CLUTTERGTK_REQUIRED=0.10
CLUTTERGST_REQUIRED=1.0
UNIQUE_REQUIRED=1.1
GEE_REQUIRED=0.5
-MX_REQUIRED=1.0
+LIBCANBERRA_REQUIRED=0.23
#*******************************************************************************
# Check for udev
@@ -140,7 +139,6 @@ PKG_CHECK_MODULES(CHEESE, \
gtk+-2.0 >= $GTK_REQUIRED \
gdk-2.0 >= $GDK_REQUIRED \
gnome-desktop-2.0 >= $LIBGNOMEDESKTOP_REQUIRED \
- gconf-2.0 >= $GCONF_REQUIRED \
gstreamer-0.10 >= $GSTREAMER_REQUIRED \
gstreamer-plugins-base-0.10 >= $GSTREAMER_REQUIRED \
cairo >= $CAIRO_REQUIRED \
@@ -153,8 +151,7 @@ PKG_CHECK_MODULES(CHEESE, \
clutter-gst-1.0 >= $CLUTTERGST_REQUIRED \
unique-1.0 >= $UNIQUE_REQUIRED \
gee-1.0 >= $GEE_REQUIRED \
- mx-1.0 >= $MX_REQUIRED \
- libcanberra-gtk \
+ libcanberra-gtk >= $LIBCANBERRA_REQUIRED \
$UDEV_PKG \
gnome-video-effects
)
@@ -169,9 +166,7 @@ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
AC_SUBST(GLIB_GENMARSHAL)
AC_SUBST(GLIB_MKENUMS)
-AC_PATH_PROG(GCONFTOOL, gconftool-2)
-AM_GCONF_SOURCE_2
-
+GLIB_GSETTINGS
#*******************************************************************************
AC_OUTPUT([
diff --git a/data/Makefile.am b/data/Makefile.am
index dc277b6..19bc2a6 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,10 +5,8 @@ desktopdir = $(datadir)/applications
desktop_in_files = cheese.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- INTLTOOL_SCHEMAS_RULE@
-schemadir = $(sysconfdir)/gconf/schemas
-schema_in_files = cheese.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+gsettings_SCHEMAS = org.gnome.Cheese.gschema.xml
+ GSETTINGS_RULES@
gtkrcdir = $(pkgdatadir)
gtkrc_DATA = gtkrc
@@ -31,31 +29,14 @@ pkgdata_DATA = \
EXTRA_DIST = \
$(desktop_in_files) \
- $(schema_in_files) \
+ $(gsettings_SCHEMAS) \
$(service_in_files) \
$(pkgdata_DATA) \
- $(gtkrc_DATA) \
- $(bugreport_SCRIPTS)
-
-bugreportdir = $(libexecdir)/cheese
-bugreport_SCRIPTS = cheese-bugreport.sh
-
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
- -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
- $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
-endif
-
-if GCONF_SCHEMAS_INSTALL
-uninstall-local:
- -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
- $(GCONFTOOL) --makefile-uninstall-rule $(schema_DATA)
-endif
+ $(gtkrc_DATA)
clean-local :
rm -f *~
DISTCLEANFILES = \
cheese.desktop \
- cheese.schemas \
org.gnome.Cheese.service
diff --git a/data/cheese-actions.ui b/data/cheese-actions.ui
index 237d0b2..73a3486 100644
--- a/data/cheese-actions.ui
+++ b/data/cheese-actions.ui
@@ -153,7 +153,6 @@
<object class="GtkRadioAction" id="photo_mode">
<property name="name">Photo</property>
<property name="label" translatable="yes">_Photo</property>
- <property name="group">photo_mode</property>
<property name="value">0</property>
<property name="active">True</property>
<signal name="activate" handler="cheese_main_window_on_mode_change"/>
diff --git a/data/cheese-prefs.ui b/data/cheese-prefs.ui
index e4e1bfe..965daba 100644
--- a/data/cheese-prefs.ui
+++ b/data/cheese-prefs.ui
@@ -3,47 +3,43 @@
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="brightness_adjustment">
- <property name="value">0</property>
<property name="lower">-1</property>
<property name="upper">1</property>
- <property name="step_increment">0.1</property>
+ <property name="step_increment">0.10000000000000001</property>
<property name="page_increment">0.5</property>
- <signal name="value-changed" handler="cheese_preferences_dialog_on_brightness_change" />
+ <signal name="value_changed" handler="cheese_preferences_dialog_on_brightness_change"/>
</object>
<object class="GtkAdjustment" id="contrast_adjustment">
<property name="value">1</property>
- <property name="lower">0</property>
<property name="upper">2</property>
- <property name="step_increment">0.1</property>
+ <property name="step_increment">0.10000000000000001</property>
<property name="page_increment">0.5</property>
- <signal name="value-changed" handler="cheese_preferences_dialog_on_contrast_change" />
+ <signal name="value_changed" handler="cheese_preferences_dialog_on_contrast_change"/>
</object>
<object class="GtkAdjustment" id="hue_adjustment">
- <property name="value">0</property>
<property name="lower">-1</property>
<property name="upper">1</property>
- <property name="step_increment">0.1</property>
+ <property name="step_increment">0.10000000000000001</property>
<property name="page_increment">0.5</property>
- <signal name="value-changed" handler="cheese_preferences_dialog_on_hue_change" />
+ <signal name="value_changed" handler="cheese_preferences_dialog_on_hue_change"/>
</object>
<object class="GtkAdjustment" id="saturation_adjustment">
<property name="value">1</property>
- <property name="lower">0</property>
<property name="upper">2</property>
- <property name="step_increment">0.1</property>
+ <property name="step_increment">0.10000000000000001</property>
<property name="page_increment">0.5</property>
- <signal name="value-changed" handler="cheese_preferences_dialog_on_saturation_change" />
+ <signal name="value_changed" handler="cheese_preferences_dialog_on_saturation_change"/>
</object>
<object class="GtkAdjustment" id="burst_count_adjustment">
<property name="value">2</property>
<property name="lower">3</property>
- <property name="upper">100</property>
+ <property name="upper">10000</property>
<property name="step_increment">1</property>
- <property name="page_increment">10</property>
+ <property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="burst_delay_adjustment">
<property name="lower">1</property>
- <property name="upper">100</property>
+ <property name="upper">10000</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
@@ -77,7 +73,6 @@
<child>
<object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkAlignment" id="alignment3">
@@ -123,12 +118,11 @@
<child>
<object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkComboBox" id="camera_combo_box">
<property name="visible">True</property>
- <signal name="changed" handler="cheese_preferences_dialog_on_source_change" />
+ <signal name="changed" handler="cheese_preferences_dialog_on_source_change"/>
</object>
<packing>
<property name="position">0</property>
@@ -138,7 +132,7 @@
<object class="GtkComboBox" id="resolution_combo_box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <signal name="changed" handler="cheese_preferences_dialog_on_resolution_change" />
+ <signal name="changed" handler="cheese_preferences_dialog_on_resolution_change"/>
</object>
<packing>
<property name="position">1</property>
@@ -178,15 +172,13 @@
<child>
<object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">2</property>
-
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="xscale">0</property>
<property name="yalign">0</property>
+ <property name="xscale">0</property>
<property name="yscale">0</property>
<property name="left_padding">10</property>
<child>
@@ -197,17 +189,15 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
-
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="xscale">0</property>
<property name="yalign">0</property>
+ <property name="xscale">0</property>
<property name="yscale">0</property>
<property name="left_padding">10</property>
<child>
@@ -225,10 +215,10 @@
<object class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="xscale">0</property>
<property name="yalign">0</property>
+ <property name="xscale">0</property>
<property name="yscale">0</property>
- <property name="left_padding">10</property>
+ <property name="left_padding">10</property>
<child>
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
@@ -237,8 +227,6 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -246,8 +234,8 @@
<object class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="xscale">0</property>
<property name="yalign">0</property>
+ <property name="xscale">0</property>
<property name="yscale">0</property>
<property name="left_padding">10</property>
<child>
@@ -258,8 +246,6 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -273,18 +259,15 @@
<child>
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkHScale" id="brightness_scale">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="draw_value">False</property>
<property name="adjustment">brightness_adjustment</property>
+ <property name="draw_value">False</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -292,8 +275,8 @@
<object class="GtkHScale" id="contrast_scale">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="draw_value">False</property>
<property name="adjustment">contrast_adjustment</property>
+ <property name="draw_value">False</property>
</object>
<packing>
<property name="position">1</property>
@@ -303,8 +286,8 @@
<object class="GtkHScale" id="saturation_scale">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="draw_value">False</property>
<property name="adjustment">saturation_adjustment</property>
+ <property name="draw_value">False</property>
</object>
<packing>
<property name="position">2</property>
@@ -314,8 +297,8 @@
<object class="GtkHScale" id="hue_scale">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="draw_value">False</property>
<property name="adjustment">hue_adjustment</property>
+ <property name="draw_value">False</property>
</object>
<packing>
<property name="position">3</property>
@@ -345,6 +328,62 @@
</packing>
</child>
<child>
+ <object class="GtkFrame" id="frame4">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment9">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkHBox" id="hbox4">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkCheckButton" id="countdown">
+ <property name="label" translatable="yes">_Countdown</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="cheese_preferences_dialog_on_countdown_toggle"/>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="flash">
+ <property name="label" translatable="yes">Fire _Flash</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="cheese_preferences_dialog_on_flash_toggle"/>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label12">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Shutter</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="label_xalign">0</property>
@@ -357,7 +396,6 @@
<child>
<object class="GtkVBox" id="vbox6">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkAlignment" id="alignment7">
@@ -403,7 +441,6 @@
<child>
<object class="GtkVBox" id="vbox7">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkSpinButton" id="burst_repeat">
@@ -411,7 +448,7 @@
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="adjustment">burst_count_adjustment</property>
- <signal name="value-changed" handler="cheese_preferences_dialog_on_burst_repeat_change" />
+ <signal name="value_changed" handler="cheese_preferences_dialog_on_burst_repeat_change"/>
</object>
<packing>
<property name="position">0</property>
@@ -423,7 +460,7 @@
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="adjustment">burst_delay_adjustment</property>
- <signal name="value-changed" handler="cheese_preferences_dialog_on_burst_delay_change" />
+ <signal name="value_changed" handler="cheese_preferences_dialog_on_burst_delay_change"/>
</object>
<packing>
<property name="position">1</property>
@@ -447,7 +484,7 @@
</child>
</object>
<packing>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
@@ -470,7 +507,7 @@
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="cheese_preferences_dialog_on_dialog_close" />
+ <signal name="clicked" handler="cheese_preferences_dialog_on_dialog_close"/>
</object>
<packing>
<property name="expand">False</property>
diff --git a/data/cheese-viewport.json b/data/cheese-viewport.json
index 9171381..da75cf2 100644
--- a/data/cheese-viewport.json
+++ b/data/cheese-viewport.json
@@ -30,7 +30,7 @@
"child::x-align": "CLUTTER_BIN_ALIGNMENT_CENTER",
"child::y-align": "CLUTTER_BIN_ALIGNMENT_CENTER",
"color": "White",
- "visible": "False"
+ "visible": false
},
{
"id": "viewport_layout",
diff --git a/data/cheese.desktop.in.in b/data/cheese.desktop.in.in
index 0a9ad2c..4b443b7 100644
--- a/data/cheese.desktop.in.in
+++ b/data/cheese.desktop.in.in
@@ -12,4 +12,3 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=cheese
X-GNOME-Bugzilla-Component=general
X-GNOME-Bugzilla-Version= VERSION@
-X-GNOME-Bugzilla-ExtraInfoScript= FULL_LIBEXECDIR@/cheese/cheese-bugreport.sh
diff --git a/data/org.gnome.Cheese.gschema.xml b/data/org.gnome.Cheese.gschema.xml
new file mode 100644
index 0000000..0e4dedb
--- /dev/null
+++ b/data/org.gnome.Cheese.gschema.xml
@@ -0,0 +1,136 @@
+<schemalist>
+ <schema id='org.gnome.Cheese' path='/apps/cheese/'>
+ <key name='countdown' type='b'>
+ <summary>Use a countdown</summary>
+ <description>
+ Set to True to show countdown when taking a photo
+ </description>
+ <default>true</default>
+ </key>
+
+ <key name='flash' type='b'>
+ <summary>Fire flash before taking a picture</summary>
+ <description>
+ Set to True to fire a flash before taking a picture
+ </description>
+ <default>true</default>
+ </key>
+
+ <key name='camera' type='s'>
+ <summary>Camera device string indicator</summary>
+ <description>
+ The device which points to the camera (e.g. /dev/video0)
+ </description>
+ <default>''</default>
+ </key>
+
+ <key name='selected-effect' type='s'>
+ <summary>Name of last selected effect</summary>
+ <description>
+ Name of installed effect that was selected last
+ </description>
+ <default>'identity'</default>
+ </key>
+
+ <key name='x-resolution' type='i'>
+ <summary>Width resolution</summary>
+ <description>
+ The width resolution of the image captured from the camera
+ </description>
+ <default>0</default>
+ </key>
+
+ <key name='y-resolution' type='i'>
+ <summary>Height resolution</summary>
+ <description>
+ The height resolution of the image captured from the camera
+ </description>
+ <default>0</default>
+ </key>
+
+ <key name='brightness' type='d'>
+ <summary>Picture brightness</summary>
+ <description>
+ Adjusts brightness level of the picture coming from the camera
+ </description>
+ <default>0</default>
+ </key>
+
+ <key name='contrast' type='d'>
+ <summary>Picture contrast</summary>
+ <description>
+ Adjusts contrast level of the picture coming from the camera
+ </description>
+ <default>0</default>
+ </key>
+
+ <key name='saturation' type='d'>
+ <summary>Picture saturation</summary>
+ <description>
+ Adjusts saturation level of the picture coming from the camera
+ </description>
+ <default>0</default>
+ </key>
+
+ <key name='hue' type='d'>
+ <summary>Picture hue</summary>
+ <description>
+ Adjusts hue level of the picture coming from the camera
+ </description>
+ <default>0</default>
+ </key>
+
+ <key name='video-path' type='s'>
+ <summary>Video Path</summary>
+ <description>
+ Defines the path where the videos are stored. If empty,
+ "XDG_VIDEO/Webcam" will be used.
+ </description>
+ <default>''</default>
+ </key>
+
+ <key name='photo-path' type='s'>
+ <summary>Photo Path</summary>
+ <description>
+ Defines the path where the photos are stored. If empty,
+ "XDG_PHOTO/Webcam" will be used.
+ </description>
+ <default>''</default>
+ </key>
+
+ <key name='wide-mode' type='b'>
+ <summary>Whether to start in wide mode</summary>
+ <description>
+ If set to true, Cheese will start up in a wide mode with the
+ image collection placed on the right-hand side. Useful with
+ small screens.
+ </description>
+ <default>false</default>
+ </key>
+
+ <key name='fullscreen' type='b'>
+ <summary>Whether to start in fullscreen</summary>
+ <description>
+ If set to true, Cheese will start up in a fullscreen mode.
+ </description>
+ <default>false</default>
+ </key>
+
+ <key name='burst-delay' type='i'>
+ <summary>Time between photos in burst mode</summary>
+ <description>
+ The length of time, in milliseconds, to delay between taking
+ each photo in a burst sequence of photos.
+ </description>
+ <default>1000</default>
+ </key>
+
+ <key name='burst-repeat' type='i'>
+ <summary>Number of photos in burst mode</summary>
+ <description>
+ The number of photos to take in a single burst.
+ </description>
+ <default>4</default>
+ </key>
+ </schema>
+</schemalist>
diff --git a/data/pixmaps/thumbnail-frame.png b/data/pixmaps/thumbnail-frame.png
index c2605d5..674b648 100644
Binary files a/data/pixmaps/thumbnail-frame.png and b/data/pixmaps/thumbnail-frame.png differ
diff --git a/help/cs/cs.po b/help/cs/cs.po
index b341063..fdb49ed 100644
--- a/help/cs/cs.po
+++ b/help/cs/cs.po
@@ -602,7 +602,7 @@ msgstr ""
"nahrávánÃ</guibutton> nebo stisknÄ?te <keycap>MezernÃk</keycap>. Také můžete "
"použÃt tlaÄ?Ãtko na webkameÅ?e, pokud nÄ?jaké má. Záznam videa zastavÃte "
"opÄ?tovným klepnutÃm na stejné tlaÄ?Ãtko, nynà nadepsané <guibutton>Zastavit "
-"nahrávánÃ</guibutton, a video bude uloženo."
+"nahrávánÃ</guibutton>, a video bude uloženo."
#: C/cheese.xml:397(para)
msgid ""
diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po
index 3172e14..f65bff6 100644
--- a/help/zh_CN/zh_CN.po
+++ b/help/zh_CN/zh_CN.po
@@ -1,16 +1,16 @@
# Simplified Chinese translation to cheese-help.
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as cheese package.
#
# ccrecall <ccrecall 163 com>, 2009.
# arccos (L.Q) <boyermoore gmail com>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: cheese\n"
-"POT-Creation-Date: 2009-11-12 10:52+0000\n"
-"PO-Revision-Date: 2009-11-14 21:52+0800\n"
-"Last-Translator: arccos (L.Q) <boyermoore gmail com>\n"
-"Language-Team: Chinese/Simplified <i18n-translation lists linux net cn>\n"
+"Project-Id-Version: cheese master\n"
+"POT-Creation-Date: 2010-07-22 16:08+0000\n"
+"PO-Revision-Date: 2010-09-05 03:24+0800\n"
+"Last-Translator: YunQiang Su <wzssyqa gmail com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -18,64 +18,54 @@ msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/cheese.xml:214(None)
-#, fuzzy
msgid ""
"@@image: 'figures/cheese-main.jpg'; md5=fbe9e9d1c9edb74f2db4ca25119f1c8b"
msgstr ""
-"@@image: 'figures/cheese-screenshot.jpg'; "
-"md5=411958761d6b512db88aae9281d73850"
+"@@image: 'figures/cheese-main.jpg'; md5=fbe9e9d1c9edb74f2db4ca25119f1c8b"
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/cheese.xml:231(None)
-#, fuzzy
msgid ""
"@@image: 'figures/cheese-wide.jpg'; md5=c2db63840f221557a7a4bbdde96847bc"
msgstr ""
-"@@image: 'figures/cheese-screenshot.jpg'; "
-"md5=411958761d6b512db88aae9281d73850"
+"@@image: 'figures/cheese-wide.jpg'; md5=c2db63840f221557a7a4bbdde96847bc"
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/cheese.xml:253(None)
-#, fuzzy
msgid ""
"@@image: 'figures/cheese-effects.jpg'; md5=cf2e23befd055fa0bed70b19f19657c9"
msgstr ""
-"@@image: 'figures/cheese-effects-screenshot.jpg'; "
-"md5=43b669aa138e9ff4c7715acadbcc5cfd"
+"@@image: 'figures/cheese-effects.jpg'; md5=cf2e23befd055fa0bed70b19f19657c9"
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/cheese.xml:344(None)
-#, fuzzy
msgid ""
"@@image: 'figures/cheese-fullscreen.jpg'; "
"md5=7836db68a654278e984a554fccd09283"
msgstr ""
-"@@image: 'figures/cheese-screenshot.jpg'; "
-"md5=411958761d6b512db88aae9281d73850"
+"@@image: 'figures/cheese-fullscreen.jpg'; "
+"md5=7836db68a654278e984a554fccd09283"
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/cheese.xml:441(None)
-#, fuzzy
msgid ""
"@@image: 'figures/cheese-preferences.jpg'; "
"md5=ebcfbcb6cb2ed034304c0410a34eb07c"
msgstr ""
-"@@image: 'figures/cheese-effects-screenshot.jpg'; "
-"md5=43b669aa138e9ff4c7715acadbcc5cfd"
+"@@image: 'figures/cheese-preferences.jpg'; "
+"md5=ebcfbcb6cb2ed034304c0410a34eb07c"
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/cheese.xml:563(None)
-#, fuzzy
msgid ""
"@@image: 'figures/cheese-share.jpg'; md5=8b94ccb434e68608677814d3666d08cf"
msgstr ""
-"@@image: 'figures/cheese-screenshot.jpg'; "
-"md5=411958761d6b512db88aae9281d73850"
+"@@image: 'figures/cheese-share.jpg'; md5=8b94ccb434e68608677814d3666d08cf"
#: C/cheese.xml:25(title)
msgid "<application>Cheese</application> Manual"
@@ -818,7 +808,6 @@ msgid "The video is sluggish/has a slow response. What can I do?"
msgstr "è§?é¢?å??åº?å¾?æ?¢/å??åº?è¿?é??ã??æ??该æ??ä¹?å??ï¼?"
#: C/cheese.xml:587(para)
-#, fuzzy
msgid ""
"You may have set \"<literal>ximagesink</literal>\" (<guilabel>X Window "
"System (No Xv)</guilabel>) as video-output. This means that your CPU is "
@@ -829,7 +818,7 @@ msgstr ""
"æ?¨å?¯è?½æ??â??<literal>ximagesink</literal>â??(<guilabel>X Window System (No Xv)</"
"guilabel>) 设为äº?è§?é¢?è¾?å?ºã??è¿?æ??å?³ç??ç?±æ?¨ç?? CPU æ?¥æ?¿æ??æ??æ??ç??å·¥ä½?ã??å°?å?¶ä¿®æ?¹"
"为â??<literal>xvimagesink</literal>â??(<guilabel>X Window System (X11/XShm/Xv)</"
-"guilabel>) å°?使æ?¨ç??æ?¾å?¡å??æ??é?¨å??å·¥ä½?ã??"
+"guilabel>) 以让æ?¨ç??æ?¾å?¡å??æ??é?¨å??å·¥ä½?ã??"
#: C/cheese.xml:593(para)
msgid ""
diff --git a/libcheese/Makefile.am b/libcheese/Makefile.am
index 32de009..c7a4c05 100644
--- a/libcheese/Makefile.am
+++ b/libcheese/Makefile.am
@@ -29,8 +29,6 @@ include $(top_srcdir)/Makefile.am.enums
libcheese_gtk_la_CFLAGS = $(CHEESE_CFLAGS)
libcheesecommon_la_SOURCES = \
- cheese-gconf.c \
- cheese-gconf.h \
cheese-fileutil.c \
cheese-fileutil.h \
cheese-camera.c \
diff --git a/libcheese/cheese-avatar-chooser.c b/libcheese/cheese-avatar-chooser.c
index 19ddcae..a5e3f6d 100644
--- a/libcheese/cheese-avatar-chooser.c
+++ b/libcheese/cheese-avatar-chooser.c
@@ -163,22 +163,24 @@ state_change_cb (GObject *object,
CheeseAvatarChooser *chooser)
{
CheeseAvatarChooserPrivate *priv = CHEESE_AVATAR_CHOOSER_GET_PRIVATE (chooser);
- CheeseWidgetState state;
+ CheeseWidgetState state;
+
g_object_get (object, "state", &state, NULL);
- switch (state) {
- case CHEESE_WIDGET_STATE_READY:
- gtk_widget_set_sensitive (priv->take_button, TRUE);
- gtk_widget_set_sensitive (priv->take_again_button, TRUE);
- break;
- case CHEESE_WIDGET_STATE_ERROR:
- gtk_widget_set_sensitive (priv->take_button, FALSE);
- gtk_widget_set_sensitive (priv->take_again_button, FALSE);
- break;
- case CHEESE_WIDGET_STATE_NONE:
- break;
- default:
- g_assert_not_reached ();
+ switch (state)
+ {
+ case CHEESE_WIDGET_STATE_READY:
+ gtk_widget_set_sensitive (priv->take_button, TRUE);
+ gtk_widget_set_sensitive (priv->take_again_button, TRUE);
+ break;
+ case CHEESE_WIDGET_STATE_ERROR:
+ gtk_widget_set_sensitive (priv->take_button, FALSE);
+ gtk_widget_set_sensitive (priv->take_again_button, FALSE);
+ break;
+ case CHEESE_WIDGET_STATE_NONE:
+ break;
+ default:
+ g_assert_not_reached ();
}
}
@@ -263,8 +265,8 @@ cheese_avatar_chooser_init (CheeseAvatarChooser *chooser)
gtk_label_new ("webcam"));
/* Image tab */
- priv->image = um_crop_area_new ();
- frame = gtk_frame_new (NULL);
+ priv->image = um_crop_area_new ();
+ frame = gtk_frame_new (NULL);
gtk_container_add (GTK_CONTAINER (frame), priv->image);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
priv->take_again_button = gtk_button_new_with_mnemonic (_("_Discard photo"));
diff --git a/libcheese/cheese-camera-device-monitor.c b/libcheese/cheese-camera-device-monitor.c
index e54e985..c2e1a29 100644
--- a/libcheese/cheese-camera-device-monitor.c
+++ b/libcheese/cheese-camera-device-monitor.c
@@ -107,14 +107,14 @@ static void
cheese_camera_device_monitor_added (CheeseCameraDeviceMonitor *monitor,
GUdevDevice *udevice)
{
- const char *device_file;
- const char *product_name;
- const char *vendor;
- const char *product;
- const char *bus;
- gint vendor_id = 0;
- gint product_id = 0;
- gint v4l_version = 0;
+ const char *device_file;
+ const char *product_name;
+ const char *vendor;
+ const char *product;
+ const char *bus;
+ gint vendor_id = 0;
+ gint product_id = 0;
+ gint v4l_version = 0;
const gchar *devpath = g_udev_device_get_property (udevice, "DEVPATH");
@@ -170,7 +170,7 @@ cheese_camera_device_monitor_added (CheeseCameraDeviceMonitor *monitor,
"Removing it from device list.", device_file);
return;
}
- product_name = g_udev_device_get_property (udevice, "ID_V4L_PRODUCT");
+ product_name = g_udev_device_get_property (udevice, "ID_V4L_PRODUCT");
}
else if (v4l_version == 0)
{
diff --git a/libcheese/cheese-camera-device-monitor.h b/libcheese/cheese-camera-device-monitor.h
index fb59cb6..ddfb009 100644
--- a/libcheese/cheese-camera-device-monitor.h
+++ b/libcheese/cheese-camera-device-monitor.h
@@ -52,10 +52,10 @@ struct _CheeseCameraDeviceMonitorClass
GObjectClass parent_class;
void (*added)(CheeseCameraDeviceMonitor *camera,
- const char *id,
- const char *device_file,
- const char *product_name,
- int api_version);
+ const char *id,
+ const char *device_file,
+ const char *product_name,
+ int api_version);
void (*removed)(CheeseCameraDeviceMonitor *camera, const char *id);
};
diff --git a/libcheese/cheese-camera-device.c b/libcheese/cheese-camera-device.c
index 3d96304..cb02c33 100644
--- a/libcheese/cheese-camera-device.c
+++ b/libcheese/cheese-camera-device.c
@@ -30,10 +30,10 @@
#include "cheese-camera-device.h"
-static void cheese_camera_device_initable_iface_init (GInitableIface *iface);
-static gboolean cheese_camera_device_initable_init (GInitable *initable,
- GCancellable *cancellable,
- GError **error);
+static void cheese_camera_device_initable_iface_init (GInitableIface *iface);
+static gboolean cheese_camera_device_initable_init (GInitable *initable,
+ GCancellable *cancellable,
+ GError **error);
G_DEFINE_TYPE_WITH_CODE (CheeseCameraDevice, cheese_camera_device, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
@@ -79,9 +79,9 @@ typedef struct
gchar *id;
const gchar *src;
gchar *name;
- gint api;
+ gint api;
GstCaps *caps;
- GList *formats;
+ GList *formats;
GError *construct_error;
} CheeseCameraDevicePrivate;
@@ -140,7 +140,7 @@ cheese_webcam_device_filter_caps (CheeseCameraDevice *device, const GstCaps *cap
* CHEESE_CAMERA_DEVICE_GET_PRIVATE (device); */
GstCaps *filter;
GstCaps *allowed;
- gint i;
+ gint i;
filter = gst_caps_new_simple (formats[0],
"framerate", GST_TYPE_FRACTION_RANGE,
@@ -321,7 +321,8 @@ cheese_camera_device_get_caps (CheeseCameraDevice *device)
priv->caps = cheese_webcam_device_filter_caps (device, caps, supported_formats);
if (!gst_caps_is_empty (priv->caps))
cheese_webcam_device_update_format_table (device);
- else {
+ else
+ {
g_set_error_literal (&priv->construct_error,
CHEESE_CAMERA_DEVICE_ERROR,
CHEESE_CAMERA_DEVICE_ERROR_UNSUPPORTED_CAPS,
@@ -330,8 +331,11 @@ cheese_camera_device_get_caps (CheeseCameraDevice *device)
gst_object_unref (pad);
gst_caps_unref (caps);
- } else {
- if (msg) {
+ }
+ else
+ {
+ if (msg)
+ {
gchar *dbg_info = NULL;
gst_message_parse_error (msg, &err, &dbg_info);
GST_WARNING ("Failed to start the capability probing pipeline");
@@ -341,11 +345,12 @@ cheese_camera_device_get_caps (CheeseCameraDevice *device)
(dbg_info) ? dbg_info : "no extra debug detail");
g_error_free (err);
err = NULL;
+
/* construct_error is meant to be displayed in the UI
- (although it currently isn't displayed in cheese),
- err->message from gstreamer is too technical for this
- purpose, the idea is warn the user about an error and point
- him to the logs for more info */
+ * (although it currently isn't displayed in cheese),
+ * err->message from gstreamer is too technical for this
+ * purpose, the idea is warn the user about an error and point
+ * him to the logs for more info */
g_set_error (&priv->construct_error,
CHEESE_CAMERA_DEVICE_ERROR,
CHEESE_CAMERA_DEVICE_ERROR_FAILED_INITIALIZATION,
@@ -366,7 +371,7 @@ cheese_camera_device_get_caps (CheeseCameraDevice *device)
static void
cheese_camera_device_constructed (GObject *object)
{
- CheeseCameraDevice *device = CHEESE_CAMERA_DEVICE (object);
+ CheeseCameraDevice *device = CHEESE_CAMERA_DEVICE (object);
CheeseCameraDevicePrivate *priv =
CHEESE_CAMERA_DEVICE_GET_PRIVATE (device);
@@ -462,8 +467,8 @@ cheese_camera_device_class_init (CheeseCameraDeviceClass *klass)
if (cheese_camera_device_cat == NULL)
GST_DEBUG_CATEGORY_INIT (cheese_camera_device_cat,
- "cheese-camera-device",
- 0, "Cheese Camera Device");
+ "cheese-camera-device",
+ 0, "Cheese Camera Device");
object_class->finalize = cheese_camera_device_finalize;
object_class->get_property = cheese_camera_device_get_property;
@@ -516,12 +521,12 @@ cheese_camera_device_init (CheeseCameraDevice *device)
}
static gboolean
-cheese_camera_device_initable_init (GInitable *initable,
+cheese_camera_device_initable_init (GInitable *initable,
GCancellable *cancellable,
- GError **error)
+ GError **error)
{
- CheeseCameraDevice *device = CHEESE_CAMERA_DEVICE (initable);
- CheeseCameraDevicePrivate *priv =
+ CheeseCameraDevice *device = CHEESE_CAMERA_DEVICE (initable);
+ CheeseCameraDevicePrivate *priv =
CHEESE_CAMERA_DEVICE_GET_PRIVATE (device);
g_return_val_if_fail (CHEESE_IS_CAMERA_DEVICE (initable), FALSE);
@@ -550,7 +555,7 @@ cheese_camera_device_new (const gchar *device_id,
const gchar *device_file,
const gchar *product_name,
gint api_version,
- GError **error)
+ GError **error)
{
return CHEESE_CAMERA_DEVICE (g_initable_new (CHEESE_TYPE_CAMERA_DEVICE,
NULL, error,
diff --git a/libcheese/cheese-camera-device.h b/libcheese/cheese-camera-device.h
index 56e2773..843a28c 100644
--- a/libcheese/cheese-camera-device.h
+++ b/libcheese/cheese-camera-device.h
@@ -64,10 +64,10 @@ CheeseCameraDevice *cheese_camera_device_new (const gchar *device_id,
const gchar *device_file,
const gchar *product_name,
gint api_version,
- GError **error);
+ GError **error);
-GstCaps * cheese_camera_device_get_caps_for_format (CheeseCameraDevice *device,
- CheeseVideoFormat *format);
+GstCaps *cheese_camera_device_get_caps_for_format (CheeseCameraDevice *device,
+ CheeseVideoFormat *format);
CheeseVideoFormat *cheese_camera_device_get_best_format (CheeseCameraDevice *device);
GList * cheese_camera_device_get_format_list (CheeseCameraDevice *device);
diff --git a/libcheese/cheese-camera.c b/libcheese/cheese-camera.c
index 095da2b..ced9a4f 100644
--- a/libcheese/cheese-camera.c
+++ b/libcheese/cheese-camera.c
@@ -67,7 +67,7 @@ typedef struct
GstElement *video_enc;
ClutterTexture *video_texture;
-
+
GstElement *effect_filter, *csp_post_effect;
GstElement *video_balance, *csp_post_balance;
GstElement *camera_tee, *effects_tee;
@@ -106,6 +106,7 @@ enum
PHOTO_SAVED,
PHOTO_TAKEN,
VIDEO_SAVED,
+ STATE_CHANGED,
LAST_SIGNAL
};
@@ -205,13 +206,27 @@ cheese_camera_bus_message_cb (GstBus *bus, GstMessage *message, CheeseCamera *ca
g_source_remove (priv->eos_timeout_id);
- g_signal_emit (camera, camera_signals[VIDEO_SAVED], 0);
+ /* emit signal by name here as the camera_signals array is empty in this thread */
+ /* TODO: really understand how threads and static works and why this is needed */
+ g_signal_emit_by_name (camera, "video-saved", NULL);
cheese_camera_change_sink (camera, priv->video_display_bin,
priv->photo_save_bin, priv->video_save_bin);
priv->is_recording = FALSE;
}
}
+ else if (GST_MESSAGE_TYPE (message) == GST_MESSAGE_STATE_CHANGED)
+ {
+ if (strcmp (GST_MESSAGE_SRC_NAME (message), "pipeline") == 0)
+ {
+ GstState old, new;
+ gst_message_parse_state_changed (message, &old, &new, NULL);
+ if (new == GST_STATE_PLAYING)
+ {
+ g_signal_emit (camera, camera_signals[STATE_CHANGED], 0, new);
+ }
+ }
+ }
}
static void
@@ -222,19 +237,21 @@ cheese_camera_add_device (CheeseCameraDeviceMonitor *monitor,
gint api_version,
CheeseCamera *camera)
{
- CheeseCameraPrivate *priv = CHEESE_CAMERA_GET_PRIVATE (camera);
- GError *error = NULL;
+ CheeseCameraPrivate *priv = CHEESE_CAMERA_GET_PRIVATE (camera);
+ GError *error = NULL;
CheeseCameraDevice *device = cheese_camera_device_new (id,
device_file,
product_name,
api_version,
&error);
+
if (device == NULL)
GST_WARNING ("Device initialization for %s failed: %s ",
device_file,
(error != NULL) ? error->message : "Unknown reason");
- else {
+ else
+ {
g_ptr_array_add (priv->camera_devices, device);
priv->num_camera_devices++;
}
@@ -353,29 +370,32 @@ cheese_camera_create_video_display_bin (CheeseCamera *camera, GError **error)
gboolean ok;
GstPad *pad;
- GError *err = NULL;
-
+ GError *err = NULL;
+
priv->video_display_bin = gst_bin_new ("video_display_bin");
cheese_camera_create_camera_source_bin (camera);
-
+
if ((priv->camera_tee = gst_element_factory_make ("tee", "camera_tee")) == NULL)
{
- cheese_camera_set_error_element_not_found (error, "tee");
+ cheese_camera_set_error_element_not_found (error, "tee");
}
if ((priv->effects_tee = gst_element_factory_make ("tee", "effects_tee")) == NULL)
{
- cheese_camera_set_error_element_not_found (error, "tee");
+ cheese_camera_set_error_element_not_found (error, "tee");
}
if ((priv->effects_valve = gst_element_factory_make ("valve", "effects_valve")) == NULL)
{
- cheese_camera_set_error_element_not_found (error, "effects_valve");
+ cheese_camera_set_error_element_not_found (error, "effects_valve");
}
if ((priv->main_valve = gst_element_factory_make ("valve", "main_valve")) == NULL)
{
- cheese_camera_set_error_element_not_found (error, "main_valve");
+ cheese_camera_set_error_element_not_found (error, "main_valve");
}
- priv->effects_downscaler = gst_parse_bin_from_description ("videoscale ! video/x-raw-yuv,width=160,height=120 ! ffmpegcolorspace", TRUE, &err);
+ priv->effects_downscaler = gst_parse_bin_from_description (
+ "videoscale ! video/x-raw-yuv,width=160,height=120 ! ffmpegcolorspace",
+ TRUE,
+ &err);
if (priv->effects_downscaler == NULL || err != NULL)
{
cheese_camera_set_error_element_not_found (error, "effects_downscaler");
@@ -424,7 +444,7 @@ cheese_camera_create_video_display_bin (CheeseCamera *camera, GError **error)
g_object_set (video_scale, "method", 1, NULL);
}
- if ((video_sink = clutter_gst_video_sink_new(priv->video_texture)) == NULL)
+ if ((video_sink = clutter_gst_video_sink_new (priv->video_texture)) == NULL)
{
cheese_camera_set_error_element_not_found (error, "cluttervideosink");
}
@@ -434,20 +454,20 @@ cheese_camera_create_video_display_bin (CheeseCamera *camera, GError **error)
return FALSE;
gst_bin_add_many (GST_BIN (priv->video_display_bin), priv->camera_source_bin,
- priv->camera_tee, priv->effects_downscaler, priv->effects_tee,
- priv->effects_valve, priv->main_valve,
+ priv->camera_tee, priv->effects_downscaler, priv->effects_tee,
+ priv->effects_valve, priv->main_valve,
priv->effect_filter, priv->csp_post_effect,
priv->video_balance, priv->csp_post_balance,
save_tee, save_queue,
video_display_queue, video_scale, video_sink, NULL);
- ok = gst_element_link_many (priv->camera_source_bin, priv->camera_tee, NULL);
+ ok = gst_element_link_many (priv->camera_source_bin, priv->camera_tee, NULL);
ok &= gst_element_link_many (priv->camera_tee, priv->main_valve, priv->effect_filter,
- priv->csp_post_effect,
- priv->video_balance, priv->csp_post_balance,
- save_tee, NULL);
+ priv->csp_post_effect,
+ priv->video_balance, priv->csp_post_balance,
+ save_tee, NULL);
ok &= gst_element_link_many (priv->camera_tee, priv->effects_valve,
- priv->effects_downscaler, priv->effects_tee, NULL);
+ priv->effects_downscaler, priv->effects_tee, NULL);
ok &= gst_element_link_many (save_tee, save_queue, NULL);
ok &= gst_element_link_many (save_tee, video_display_queue, video_scale, video_sink, NULL);
@@ -467,7 +487,7 @@ cheese_camera_relink_camera_source_bin (CheeseCamera *camera)
{
CheeseCameraPrivate *priv = CHEESE_CAMERA_GET_PRIVATE (camera);
- gst_element_unlink (priv->camera_source_bin, priv->camera_tee);
+ gst_element_unlink (priv->camera_source_bin, priv->camera_tee);
gst_bin_remove (GST_BIN (priv->video_display_bin), priv->camera_source_bin);
cheese_camera_create_camera_source_bin (camera);
@@ -722,17 +742,17 @@ static void
cheese_camera_change_effect_filter (CheeseCamera *camera, GstElement *new_filter)
{
CheeseCameraPrivate *priv = CHEESE_CAMERA_GET_PRIVATE (camera);
- gboolean ok;
+ gboolean ok;
g_object_set (G_OBJECT (priv->main_valve), "drop", TRUE, NULL);
-
+
gst_element_unlink_many (priv->main_valve, priv->effect_filter,
priv->csp_post_effect, NULL);
- g_object_ref(priv->effect_filter);
+ g_object_ref (priv->effect_filter);
gst_bin_remove (GST_BIN (priv->video_display_bin), priv->effect_filter);
- priv->effect_filter = NULL;
- g_object_unref(priv->effect_filter);
+ gst_element_set_state (priv->effect_filter, GST_STATE_NULL);
+ g_object_unref (priv->effect_filter);
gst_bin_add (GST_BIN (priv->video_display_bin), new_filter);
ok = gst_element_link_many (priv->main_valve, new_filter,
@@ -742,11 +762,11 @@ cheese_camera_change_effect_filter (CheeseCamera *camera, GstElement *new_filter
g_return_if_fail (ok);
g_object_set (G_OBJECT (priv->main_valve), "drop", FALSE, NULL);
-
+
priv->effect_filter = new_filter;
}
-GstElement*
+GstElement *
cheese_camera_element_from_effect (CheeseCamera *camera, CheeseEffect *effect)
{
char *effects_pipeline_desc;
@@ -768,6 +788,7 @@ cheese_camera_element_from_effect (CheeseCamera *camera, CheeseEffect *effect)
{
g_error_free (err);
g_warning ("Error with effect filter %s. Ignored", name);
+ return NULL;
}
g_free (effects_pipeline_desc);
@@ -778,14 +799,16 @@ void
cheese_camera_set_effect (CheeseCamera *camera, CheeseEffect *effect)
{
GstElement *effect_filter;
+
effect_filter = cheese_camera_element_from_effect (camera, effect);
- cheese_camera_change_effect_filter (camera, effect_filter);
+ if (effect_filter != NULL)
+ cheese_camera_change_effect_filter (camera, effect_filter);
}
void
cheese_camera_toggle_effects_pipeline (CheeseCamera *camera, gboolean active)
{
- CheeseCameraPrivate *priv = CHEESE_CAMERA_GET_PRIVATE (camera);
+ CheeseCameraPrivate *priv = CHEESE_CAMERA_GET_PRIVATE (camera);
if (active)
{
@@ -803,41 +826,40 @@ void
cheese_camera_connect_effect_texture (CheeseCamera *camera, CheeseEffect *effect, ClutterTexture *texture)
{
CheeseCameraPrivate *priv = CHEESE_CAMERA_GET_PRIVATE (camera);
-
+
GstElement *effect_filter;
GstElement *display_element;
GstElement *display_queue;
GstElement *control_valve;
- gboolean ok;
+ gboolean ok;
g_object_set (G_OBJECT (priv->effects_valve), "drop", TRUE, NULL);
control_valve = gst_element_factory_make ("valve", NULL);
g_object_set (G_OBJECT (effect), "control_valve", control_valve, NULL);
-
+
display_queue = gst_element_factory_make ("queue", NULL);
effect_filter = cheese_camera_element_from_effect (camera, effect);
display_element = clutter_gst_video_sink_new (texture);
g_object_set (G_OBJECT (display_element), "async", FALSE, NULL);
-
+
gst_bin_add_many (GST_BIN (priv->pipeline), control_valve, effect_filter, display_queue, display_element, NULL);
ok = gst_element_link_many (priv->effects_tee, control_valve, effect_filter, display_queue, display_element, NULL);
- // HACK: I don't understand GStreamer enough to know why this works.
+ /* HACK: I don't understand GStreamer enough to know why this works. */
gst_element_set_state (control_valve, GST_STATE_PLAYING);
gst_element_set_state (effect_filter, GST_STATE_PLAYING);
gst_element_set_state (display_queue, GST_STATE_PLAYING);
- gst_element_set_state (display_element, GST_STATE_PLAYING);
+ gst_element_set_state (display_element, GST_STATE_PLAYING);
- g_object_set (G_OBJECT (priv->effects_valve), "drop", FALSE, NULL);
+ g_object_set (G_OBJECT (priv->effects_valve), "drop", FALSE, NULL);
}
-
void
cheese_camera_start_video_recording (CheeseCamera *camera, char *filename)
{
@@ -997,8 +1019,9 @@ cheese_camera_set_property (GObject *object, guint prop_id, const GValue *value,
{
case PROP_VIDEO_TEXTURE:
priv->video_texture = g_value_get_pointer (value);
- // g_signal_connect (priv->video_window, "expose-event",
- // G_CALLBACK (cheese_camera_expose_cb), self);
+
+ /* g_signal_connect (priv->video_window, "expose-event", */
+ /* G_CALLBACK (cheese_camera_expose_cb), self); */
break;
case PROP_DEVICE_NAME:
g_free (priv->device_name);
@@ -1050,6 +1073,13 @@ cheese_camera_class_init (CheeseCameraClass *klass)
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+ camera_signals[STATE_CHANGED] = g_signal_new ("state-changed", G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (CheeseCameraClass, state_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__INT,
+ G_TYPE_NONE, 1, G_TYPE_INT);
+
g_object_class_install_property (object_class, PROP_VIDEO_TEXTURE,
g_param_spec_pointer ("video-texture",
@@ -1187,7 +1217,7 @@ void
cheese_camera_set_device_by_dev_udi (CheeseCamera *camera, char *udi)
{
CheeseCameraPrivate *priv;
- int i;
+ int i;
g_return_if_fail (CHEESE_IS_CAMERA (camera));
@@ -1237,6 +1267,7 @@ void
cheese_camera_set_video_format (CheeseCamera *camera, CheeseVideoFormat *format)
{
CheeseCameraPrivate *priv;
+
g_return_if_fail (CHEESE_IS_CAMERA (camera));
g_return_if_fail (format != NULL);
@@ -1258,6 +1289,7 @@ const CheeseVideoFormat *
cheese_camera_get_current_video_format (CheeseCamera *camera)
{
CheeseCameraPrivate *priv = CHEESE_CAMERA_GET_PRIVATE (camera);
+
g_return_val_if_fail (CHEESE_IS_CAMERA (camera), NULL);
return priv->current_format;
diff --git a/libcheese/cheese-camera.h b/libcheese/cheese-camera.h
index f6a61f9..958bd34 100644
--- a/libcheese/cheese-camera.h
+++ b/libcheese/cheese-camera.h
@@ -51,6 +51,7 @@ typedef struct
void (*photo_saved)(CheeseCamera *camera);
void (*photo_taken)(CheeseCamera *camera, GdkPixbuf *pixbuf);
void (*video_saved)(CheeseCamera *camera);
+ void (*state_changed)(CheeseCamera *camera, GstState new_state);
} CheeseCameraClass;
enum CheeseCameraError
@@ -62,36 +63,38 @@ enum CheeseCameraError
GType cheese_camera_get_type (void);
CheeseCamera *cheese_camera_new (ClutterTexture *video_texture,
- char *camera_device_name,
- int x_resolution,
- int y_resolution);
+ char *camera_device_name,
+ int x_resolution,
+ int y_resolution);
const CheeseVideoFormat *cheese_camera_get_current_video_format (CheeseCamera *camera);
void cheese_camera_setup (CheeseCamera *camera, char *udi, GError **error);
void cheese_camera_play (CheeseCamera *camera);
void cheese_camera_stop (CheeseCamera *camera);
void cheese_camera_set_effect (CheeseCamera *camera, CheeseEffect *effect);
-void cheese_camera_connect_effect_texture (CheeseCamera *camera, CheeseEffect *effect, ClutterTexture *texture);
-void cheese_camera_start_video_recording (CheeseCamera *camera, char *filename);
-void cheese_camera_stop_video_recording (CheeseCamera *camera);
-gboolean cheese_camera_take_photo (CheeseCamera *camera, char *filename);
-gboolean cheese_camera_take_photo_pixbuf (CheeseCamera *camera);
-gboolean cheese_camera_has_camera (CheeseCamera *camera);
-int cheese_camera_get_num_camera_devices (CheeseCamera *camera);
-CheeseCameraDevice * cheese_camera_get_selected_device (CheeseCamera *camera);
-GPtrArray * cheese_camera_get_camera_devices (CheeseCamera *camera);
-void cheese_camera_set_device_by_dev_file (CheeseCamera *camera, char *file);
-void cheese_camera_set_device_by_dev_udi (CheeseCamera *camera, char *udi);
-gboolean cheese_camera_switch_camera_device (CheeseCamera *camera);
-GList * cheese_camera_get_video_formats (CheeseCamera *camera);
-void cheese_camera_set_video_format (CheeseCamera *camera,
- CheeseVideoFormat *format);
+void cheese_camera_connect_effect_texture (CheeseCamera *camera,
+ CheeseEffect *effect,
+ ClutterTexture *texture);
+void cheese_camera_start_video_recording (CheeseCamera *camera, char *filename);
+void cheese_camera_stop_video_recording (CheeseCamera *camera);
+gboolean cheese_camera_take_photo (CheeseCamera *camera, char *filename);
+gboolean cheese_camera_take_photo_pixbuf (CheeseCamera *camera);
+gboolean cheese_camera_has_camera (CheeseCamera *camera);
+int cheese_camera_get_num_camera_devices (CheeseCamera *camera);
+CheeseCameraDevice *cheese_camera_get_selected_device (CheeseCamera *camera);
+GPtrArray * cheese_camera_get_camera_devices (CheeseCamera *camera);
+void cheese_camera_set_device_by_dev_file (CheeseCamera *camera, char *file);
+void cheese_camera_set_device_by_dev_udi (CheeseCamera *camera, char *udi);
+gboolean cheese_camera_switch_camera_device (CheeseCamera *camera);
+GList * cheese_camera_get_video_formats (CheeseCamera *camera);
+void cheese_camera_set_video_format (CheeseCamera *camera,
+ CheeseVideoFormat *format);
gboolean cheese_camera_get_balance_property_range (CheeseCamera *camera,
gchar *property,
gdouble *min, gdouble *max, gdouble *def);
void cheese_camera_set_balance_property (CheeseCamera *camera, gchar *property, gdouble value);
void cheese_camera_toggle_effects_pipeline (CheeseCamera *camera, gboolean active);
-
+
G_END_DECLS
#endif /* __CHEESE_CAMERA_H__ */
diff --git a/libcheese/cheese-countdown.c b/libcheese/cheese-countdown.c
index b3c6a79..43870b2 100644
--- a/libcheese/cheese-countdown.c
+++ b/libcheese/cheese-countdown.c
@@ -333,7 +333,7 @@ do_text (cairo_t *pContext,
static gboolean
on_expose (GtkWidget *widget, GdkEventExpose *pEvent, gpointer data)
{
- CheeseCountdownPrivate *priv = CHEESE_COUNTDOWN_GET_PRIVATE (widget);
+ CheeseCountdownPrivate *priv = CHEESE_COUNTDOWN_GET_PRIVATE (widget);
GtkAllocation allocation;
cairo_t *pContext = NULL;
cairo_pattern_t *pattern;
@@ -347,7 +347,7 @@ on_expose (GtkWidget *widget, GdkEventExpose *pEvent, gpointer data)
gdouble fHeight;
gtk_widget_get_allocation (widget, &allocation);
- fWidth = (gdouble) allocation.width;
+ fWidth = (gdouble) allocation.width;
fHeight = (gdouble) allocation.height;
/* 3 * 26 are the three numbers, 30 is the width of camera-icon.svg */
diff --git a/libcheese/cheese-effect.c b/libcheese/cheese-effect.c
index a1e4905..7045cf1 100644
--- a/libcheese/cheese-effect.c
+++ b/libcheese/cheese-effect.c
@@ -36,7 +36,8 @@ G_DEFINE_TYPE (CheeseEffect, cheese_effect, G_TYPE_OBJECT)
typedef struct _CheeseEffectPrivate CheeseEffectPrivate;
-struct _CheeseEffectPrivate {
+struct _CheeseEffectPrivate
+{
char *name;
char *pipeline_desc;
GstElement *control_valve;
@@ -48,18 +49,19 @@ cheese_effect_get_property (GObject *object, guint property_id,
{
CheeseEffectPrivate *priv = CHEESE_EFFECT_GET_PRIVATE (object);
- switch (property_id) {
- case PROP_NAME:
- g_value_set_string (value, priv->name);
- break;
- case PROP_PIPELINE_DESC:
- g_value_set_string (value, priv->pipeline_desc);
- break;
- case PROP_CONTROL_VALVE:
- g_value_set_object (value, priv->control_valve);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ switch (property_id)
+ {
+ case PROP_NAME:
+ g_value_set_string (value, priv->name);
+ break;
+ case PROP_PIPELINE_DESC:
+ g_value_set_string (value, priv->pipeline_desc);
+ break;
+ case PROP_CONTROL_VALVE:
+ g_value_set_object (value, priv->control_valve);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
}
@@ -69,23 +71,24 @@ cheese_effect_set_property (GObject *object, guint property_id,
{
CheeseEffectPrivate *priv = CHEESE_EFFECT_GET_PRIVATE (object);
- switch (property_id) {
- case PROP_NAME:
- g_free (priv->name);
- priv->name = g_value_dup_string (value);
- break;
- case PROP_PIPELINE_DESC:
- g_free (priv->pipeline_desc);
- priv->pipeline_desc = g_value_dup_string (value);
- break;
- case PROP_CONTROL_VALVE:
- if (priv->control_valve != NULL)
- g_object_unref (G_OBJECT (priv->control_valve));
- priv->control_valve = GST_ELEMENT (g_value_get_object (value));
- g_object_ref (G_OBJECT (priv->control_valve));
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ switch (property_id)
+ {
+ case PROP_NAME:
+ g_free (priv->name);
+ priv->name = g_value_dup_string (value);
+ break;
+ case PROP_PIPELINE_DESC:
+ g_free (priv->pipeline_desc);
+ priv->pipeline_desc = g_value_dup_string (value);
+ break;
+ case PROP_CONTROL_VALVE:
+ if (priv->control_valve != NULL)
+ g_object_unref (G_OBJECT (priv->control_valve));
+ priv->control_valve = GST_ELEMENT (g_value_get_object (value));
+ g_object_ref (G_OBJECT (priv->control_valve));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
}
@@ -117,13 +120,13 @@ cheese_effect_class_init (CheeseEffectClass *klass)
NULL,
GST_TYPE_ELEMENT,
G_PARAM_READWRITE));
-
}
gboolean
cheese_effect_is_preview_connected (CheeseEffect *self)
{
CheeseEffectPrivate *priv = CHEESE_EFFECT_GET_PRIVATE (self);
+
return priv->control_valve != NULL;
}
@@ -131,6 +134,7 @@ void
cheese_effect_enable_preview (CheeseEffect *self)
{
CheeseEffectPrivate *priv = CHEESE_EFFECT_GET_PRIVATE (self);
+
g_object_set (G_OBJECT (priv->control_valve), "drop", FALSE, NULL);
}
@@ -138,6 +142,7 @@ void
cheese_effect_disable_preview (CheeseEffect *self)
{
CheeseEffectPrivate *priv = CHEESE_EFFECT_GET_PRIVATE (self);
+
g_object_set (G_OBJECT (priv->control_valve), "drop", TRUE, NULL);
}
@@ -146,7 +151,7 @@ cheese_effect_init (CheeseEffect *self)
{
}
-CheeseEffect*
+CheeseEffect *
cheese_effect_new (void)
{
return g_object_new (CHEESE_TYPE_EFFECT, NULL);
diff --git a/libcheese/cheese-effect.h b/libcheese/cheese-effect.h
index 4157d25..0bd72c7 100644
--- a/libcheese/cheese-effect.h
+++ b/libcheese/cheese-effect.h
@@ -24,7 +24,7 @@
G_BEGIN_DECLS
-#define CHEESE_TYPE_EFFECT cheese_effect_get_type()
+#define CHEESE_TYPE_EFFECT cheese_effect_get_type ()
#define CHEESE_EFFECT(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), CHEESE_TYPE_EFFECT, CheeseEffect))
@@ -41,22 +41,23 @@ G_BEGIN_DECLS
#define CHEESE_EFFECT_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), CHEESE_TYPE_EFFECT, CheeseEffectClass))
-typedef struct {
+typedef struct
+{
GObject parent;
} CheeseEffect;
-typedef struct {
+typedef struct
+{
GObjectClass parent_class;
} CheeseEffectClass;
GType cheese_effect_get_type (void);
-CheeseEffect* cheese_effect_new (void);
-gboolean cheese_effect_is_preview_connected (CheeseEffect* self);
-void cheese_effect_enable_preview (CheeseEffect* self);
-void cheese_effect_disable_preview (CheeseEffect* self);
+CheeseEffect *cheese_effect_new (void);
+gboolean cheese_effect_is_preview_connected (CheeseEffect *self);
+void cheese_effect_enable_preview (CheeseEffect *self);
+void cheese_effect_disable_preview (CheeseEffect *self);
G_END_DECLS
#endif /* _CHEESE_EFFECT_H_ */
-
diff --git a/libcheese/cheese-fileutil.c b/libcheese/cheese-fileutil.c
index 90acd26..80aca6a 100644
--- a/libcheese/cheese-fileutil.c
+++ b/libcheese/cheese-fileutil.c
@@ -28,7 +28,6 @@
#include <string.h>
#include "cheese-fileutil.h"
-#include "cheese-gconf.h"
G_DEFINE_TYPE (CheeseFileUtil, cheese_fileutil, G_TYPE_OBJECT)
@@ -39,7 +38,6 @@ typedef struct
{
gchar *video_path;
gchar *photo_path;
- gchar *log_path;
gint burst_count;
gchar *burst_raw_name;
} CheeseFileUtilPrivate;
@@ -75,18 +73,6 @@ cheese_fileutil_get_path_before_224 (CheeseFileUtil *fileutil)
}
gchar *
-cheese_fileutil_get_log_path (CheeseFileUtil *fileutil)
-{
- CheeseFileUtilPrivate *priv = CHEESE_FILEUTIL_GET_PRIVATE (fileutil);
-
- gchar *path;
-
- path = priv->log_path;
-
- return path;
-}
-
-gchar *
cheese_fileutil_get_new_media_filename (CheeseFileUtil *fileutil, CheeseMediaMode mode)
{
struct tm *ptr;
@@ -175,7 +161,6 @@ cheese_fileutil_finalize (GObject *object)
g_free (priv->video_path);
g_free (priv->photo_path);
- g_free (priv->log_path);
G_OBJECT_CLASS (cheese_fileutil_parent_class)->finalize (object);
}
@@ -197,12 +182,12 @@ cheese_fileutil_init (CheeseFileUtil *fileutil)
priv->burst_count = 0;
priv->burst_raw_name = "";
- CheeseGConf *gconf;
+ GSettings *settings;
- gconf = cheese_gconf_new ();
+ settings = g_settings_new ("org.gnome.Cheese");
- g_object_get (gconf, "gconf_prop_video_path", &priv->video_path, NULL);
- g_object_get (gconf, "gconf_prop_photo_path", &priv->photo_path, NULL);
+ g_settings_get (settings, "video-path", "s", &priv->video_path);
+ g_settings_get (settings, "photo-path", "s", &priv->video_path);
/* get the video path from gconf, xdg or hardcoded */
if (!priv->video_path || strcmp (priv->video_path, "") == 0)
@@ -216,7 +201,7 @@ cheese_fileutil_init (CheeseFileUtil *fileutil)
}
}
- /* get the photo path from gconf, xdg or hardcoded */
+ /* get the photo path from gsettings, xdg or hardcoded */
if (!priv->photo_path || strcmp (priv->photo_path, "") == 0)
{
/* get xdg */
@@ -228,10 +213,7 @@ cheese_fileutil_init (CheeseFileUtil *fileutil)
}
}
- /* FIXME: use the xdg log path */
- priv->log_path = g_strjoin (G_DIR_SEPARATOR_S, g_get_home_dir (), ".gnome2", "cheese", NULL);
-
- g_object_unref (gconf);
+ g_object_unref (settings);
}
CheeseFileUtil *
diff --git a/libcheese/cheese-fileutil.h b/libcheese/cheese-fileutil.h
index c9a1063..0f209f1 100644
--- a/libcheese/cheese-fileutil.h
+++ b/libcheese/cheese-fileutil.h
@@ -60,7 +60,6 @@ CheeseFileUtil *cheese_fileutil_new (void);
gchar *cheese_fileutil_get_video_path (CheeseFileUtil *fileutil);
gchar *cheese_fileutil_get_photo_path (CheeseFileUtil *fileutil);
gchar *cheese_fileutil_get_path_before_224 (CheeseFileUtil *fileutil);
-gchar *cheese_fileutil_get_log_path (CheeseFileUtil *fileutil);
gchar *cheese_fileutil_get_new_media_filename (CheeseFileUtil *fileutil, CheeseMediaMode mode);
void cheese_fileutil_reset_burst (CheeseFileUtil *fileutil);
diff --git a/libcheese/cheese-gtk.symbols b/libcheese/cheese-gtk.symbols
index bd8dcd9..156543f 100644
--- a/libcheese/cheese-gtk.symbols
+++ b/libcheese/cheese-gtk.symbols
@@ -1,11 +1,9 @@
cheese_widget_get_type
cheese_widget_new
cheese_widget_get_camera
-cheese_widget_get_gconf
cheese_widget_get_video_area
cheese_widget_get_error
cheese_widget_state_get_type
-cheese_gconf_get_type
cheese_camera_get_type
cheese_camera_cat
cheese_camera_device_get_type
diff --git a/libcheese/cheese-widget-private.h b/libcheese/cheese-widget-private.h
index 2cba699..96c6ca7 100644
--- a/libcheese/cheese-widget-private.h
+++ b/libcheese/cheese-widget-private.h
@@ -29,11 +29,11 @@ enum
SPINNER_PAGE = 0,
WEBCAM_PAGE = 1,
PROBLEM_PAGE = 2,
- LAST_PAGE = 3,
+ LAST_PAGE = 3,
};
GObject *cheese_widget_get_camera (CheeseWidget *widget);
-GObject *cheese_widget_get_gconf (CheeseWidget *widget);
+GSettings *cheese_widget_get_settings (CheeseWidget *widget);
GtkWidget *cheese_widget_get_video_area (CheeseWidget *widget);
G_END_DECLS
diff --git a/libcheese/cheese-widget.c b/libcheese/cheese-widget.c
index d61b956..7ba5c74 100644
--- a/libcheese/cheese-widget.c
+++ b/libcheese/cheese-widget.c
@@ -22,7 +22,6 @@
#include <glib/gi18n.h>
#include "cheese-widget.h"
-#include "cheese-gconf.h"
#include "cheese-camera.h"
#include "cheese-enum-types.h"
@@ -50,8 +49,9 @@ typedef struct
{
GtkWidget *spinner;
GtkWidget *screen;
+ ClutterActor *texture;
GtkWidget *problem;
- CheeseGConf *gconf;
+ GSettings *settings;
CheeseCamera *webcam;
CheeseWidgetState state;
GError *error;
@@ -187,6 +187,7 @@ cheese_widget_init (CheeseWidget *widget)
{
CheeseWidgetPrivate *priv = CHEESE_WIDGET_GET_PRIVATE (widget);
GtkWidget *box;
+ ClutterActor *stage;
priv->state = CHEESE_WIDGET_STATE_NONE;
priv->error = NULL;
@@ -207,8 +208,15 @@ cheese_widget_init (CheeseWidget *widget)
box, gtk_label_new ("spinner"));
/* Webcam page */
- priv->screen = gtk_drawing_area_new ();
+ priv->screen = gtk_clutter_embed_new ();
+ stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (priv->screen));
+ priv->texture = clutter_texture_new ();
+
+ clutter_actor_set_size (priv->texture, 400, 300);
+ clutter_container_add_actor (CLUTTER_CONTAINER (stage), priv->texture);
+
gtk_widget_show (priv->screen);
+ clutter_actor_show (priv->texture);
gtk_notebook_append_page (GTK_NOTEBOOK (widget),
priv->screen, gtk_label_new ("webcam"));
@@ -219,7 +227,7 @@ cheese_widget_init (CheeseWidget *widget)
priv->problem,
gtk_label_new ("got problems"));
- priv->gconf = cheese_gconf_new ();
+ priv->settings = g_settings_new ("org.gnome.Cheese");
}
static void
@@ -227,10 +235,10 @@ cheese_widget_finalize (GObject *object)
{
CheeseWidgetPrivate *priv = CHEESE_WIDGET_GET_PRIVATE (object);
- if (priv->gconf)
+ if (priv->settings)
{
- g_object_unref (priv->gconf);
- priv->gconf = NULL;
+ g_object_unref (priv->settings);
+ priv->settings = NULL;
}
if (priv->webcam)
{
@@ -261,6 +269,7 @@ cheese_widget_set_property (GObject *object, guint prop_id,
break;
}
}
+
#endif
static void
@@ -301,19 +310,17 @@ setup_camera (CheeseWidget *widget)
gdouble contrast;
gdouble saturation;
gdouble hue;
-
- g_object_get (priv->gconf,
- "gconf_prop_x_resolution", &x_resolution,
- "gconf_prop_y_resolution", &y_resolution,
- "gconf_prop_camera", &webcam_device,
- "gconf_prop_brightness", &brightness,
- "gconf_prop_contrast", &contrast,
- "gconf_prop_saturation", &saturation,
- "gconf_prop_hue", &hue,
- NULL);
+
+ g_settings_get (priv->settings, "x-resolution", "i", &x_resolution);
+ g_settings_get (priv->settings, "y-resolution", "i", &y_resolution);
+ g_settings_get (priv->settings, "camera", "s", &webcam_device);
+ g_settings_get (priv->settings, "brightness", "d", &brightness);
+ g_settings_get (priv->settings, "contrast", "d", &contrast);
+ g_settings_get (priv->settings, "saturation", "d", &saturation);
+ g_settings_get (priv->settings, "hue", "d", &hue);
gdk_threads_enter ();
- priv->webcam = cheese_camera_new (priv->screen,
+ priv->webcam = cheese_camera_new (CLUTTER_TEXTURE (priv->texture),
webcam_device,
x_resolution,
y_resolution);
@@ -352,7 +359,7 @@ static void
cheese_widget_realize (GtkWidget *widget)
{
GdkWindow *window;
- CheeseWidgetPrivate *priv = CHEESE_WIDGET_GET_PRIVATE (widget);
+ CheeseWidgetPrivate *priv = CHEESE_WIDGET_GET_PRIVATE (widget);
GTK_WIDGET_CLASS (cheese_widget_parent_class)->realize (widget);
@@ -401,7 +408,7 @@ cheese_widget_class_init (CheeseWidgetClass *klass)
object_class->set_property = cheese_widget_set_property;
#endif
object_class->get_property = cheese_widget_get_property;
- widget_class->realize = cheese_widget_realize;
+ widget_class->realize = cheese_widget_realize;
/**
* CheeseWidget:state:
@@ -436,8 +443,8 @@ cheese_widget_new (void)
return g_object_new (CHEESE_TYPE_WIDGET, NULL);
}
-GObject *
-cheese_widget_get_gconf (CheeseWidget *widget)
+GSettings *
+cheese_widget_get_settings (CheeseWidget *widget)
{
CheeseWidgetPrivate *priv;
@@ -445,7 +452,7 @@ cheese_widget_get_gconf (CheeseWidget *widget)
priv = CHEESE_WIDGET_GET_PRIVATE (widget);
- return G_OBJECT (priv->gconf);
+ return G_OBJECT (priv->settings);
}
GObject *
@@ -463,7 +470,7 @@ cheese_widget_get_camera (CheeseWidget *widget)
GtkWidget *
cheese_widget_get_video_area (CheeseWidget *widget)
{
- CheeseWidgetPrivate *priv;
+ CheeseWidgetPrivate *priv;
g_return_val_if_fail (CHEESE_WIDGET (widget), NULL);
diff --git a/libcheese/cheese-widget.h b/libcheese/cheese-widget.h
index 62c2092..86dbc62 100644
--- a/libcheese/cheese-widget.h
+++ b/libcheese/cheese-widget.h
@@ -22,6 +22,8 @@
#include <glib-object.h>
#include <gtk/gtk.h>
+#include <clutter/clutter.h>
+#include <clutter-gtk/clutter-gtk.h>
G_BEGIN_DECLS
diff --git a/libcheese/um-crop-area.c b/libcheese/um-crop-area.c
index d463658..dd79e1d 100644
--- a/libcheese/um-crop-area.c
+++ b/libcheese/um-crop-area.c
@@ -27,17 +27,18 @@
#include "um-crop-area.h"
-struct _UmCropAreaPrivate {
- GdkPixbuf *browse_pixbuf;
- GdkPixbuf *pixbuf;
- GdkPixbuf *color_shifted;
- gdouble scale;
- GdkRectangle image;
- GdkCursorType current_cursor;
- GdkRectangle crop;
- gint active_region;
- gint last_press_x;
- gint last_press_y;
+struct _UmCropAreaPrivate
+{
+ GdkPixbuf *browse_pixbuf;
+ GdkPixbuf *pixbuf;
+ GdkPixbuf *color_shifted;
+ gdouble scale;
+ GdkRectangle image;
+ GdkCursorType current_cursor;
+ GdkRectangle crop;
+ gint active_region;
+ gint last_press_x;
+ gint last_press_y;
};
G_DEFINE_TYPE (UmCropArea, um_crop_area, GTK_TYPE_DRAWING_AREA);
@@ -46,283 +47,290 @@ static inline guchar
shift_color_byte (guchar b,
int shift)
{
- return CLAMP(b + shift, 0, 255);
+ return CLAMP (b + shift, 0, 255);
}
static void
shift_colors (GdkPixbuf *pixbuf,
- gint red,
- gint green,
- gint blue,
- gint alpha)
+ gint red,
+ gint green,
+ gint blue,
+ gint alpha)
{
- gint x, y, offset, y_offset, rowstride, width, height;
- guchar *pixels;
- gint channels;
-
- width = gdk_pixbuf_get_width (pixbuf);
- height = gdk_pixbuf_get_height (pixbuf);
- rowstride = gdk_pixbuf_get_rowstride (pixbuf);
- pixels = gdk_pixbuf_get_pixels (pixbuf);
- channels = gdk_pixbuf_get_n_channels (pixbuf);
-
- for (y = 0; y < height; y++) {
- y_offset = y * rowstride;
- for (x = 0; x < width; x++) {
- offset = y_offset + x * channels;
- if (red != 0)
- pixels[offset] = shift_color_byte (pixels[offset], red);
- if (green != 0)
- pixels[offset + 1] = shift_color_byte (pixels[offset + 1], green);
- if (blue != 0)
- pixels[offset + 2] = shift_color_byte (pixels[offset + 2], blue);
- if (alpha != 0 && channels >= 4)
- pixels[offset + 3] = shift_color_byte (pixels[offset + 3], blue);
- }
- }
+ gint x, y, offset, y_offset, rowstride, width, height;
+ guchar *pixels;
+ gint channels;
+
+ width = gdk_pixbuf_get_width (pixbuf);
+ height = gdk_pixbuf_get_height (pixbuf);
+ rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+ pixels = gdk_pixbuf_get_pixels (pixbuf);
+ channels = gdk_pixbuf_get_n_channels (pixbuf);
+
+ for (y = 0; y < height; y++)
+ {
+ y_offset = y * rowstride;
+ for (x = 0; x < width; x++)
+ {
+ offset = y_offset + x * channels;
+ if (red != 0)
+ pixels[offset] = shift_color_byte (pixels[offset], red);
+ if (green != 0)
+ pixels[offset + 1] = shift_color_byte (pixels[offset + 1], green);
+ if (blue != 0)
+ pixels[offset + 2] = shift_color_byte (pixels[offset + 2], blue);
+ if (alpha != 0 && channels >= 4)
+ pixels[offset + 3] = shift_color_byte (pixels[offset + 3], blue);
+ }
+ }
}
static void
update_pixbufs (UmCropArea *area)
{
- GtkAllocation allocation;
- GtkStyle *style;
- GtkWidget *widget;
- GdkColor *color;
- gdouble scale;
- gint width;
- gint height;
- gint dest_x, dest_y, dest_width, dest_height;
- guint32 pixel;
-
- widget = GTK_WIDGET (area);
- gtk_widget_get_allocation (widget, &allocation);
-
- if (area->priv->pixbuf == NULL ||
- gdk_pixbuf_get_width (area->priv->pixbuf) != allocation.width ||
- gdk_pixbuf_get_height (area->priv->pixbuf) != allocation.height) {
- if (area->priv->pixbuf != NULL)
- g_object_unref (area->priv->pixbuf);
- area->priv->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
- allocation.width, allocation.height);
-
- style = gtk_widget_get_style (widget);
- color = &style->bg[gtk_widget_get_state (widget)];
- pixel = ((color->red & 0xff00) << 16) |
- ((color->green & 0xff00) << 8) |
- (color->blue & 0xff00);
- gdk_pixbuf_fill (area->priv->pixbuf, pixel);
-
- width = gdk_pixbuf_get_width (area->priv->browse_pixbuf);
- height = gdk_pixbuf_get_height (area->priv->browse_pixbuf);
-
- scale = allocation.height / (gdouble)height;
- if (scale * width > allocation.width)
- scale = allocation.width / (gdouble)width;
-
- dest_width = width * scale;
- dest_height = height * scale;
- dest_x = (allocation.width - dest_width) / 2;
- dest_y = (allocation.height - dest_height) / 2,
-
- gdk_pixbuf_scale (area->priv->browse_pixbuf,
- area->priv->pixbuf,
- dest_x, dest_y,
- dest_width, dest_height,
- dest_x, dest_y,
- scale, scale,
- GDK_INTERP_BILINEAR);
-
- if (area->priv->color_shifted)
- g_object_unref (area->priv->color_shifted);
- area->priv->color_shifted = gdk_pixbuf_copy (area->priv->pixbuf);
- shift_colors (area->priv->color_shifted, -32, -32, -32, 0);
-
- if (area->priv->scale == 0.0) {
- area->priv->crop.width = 96.0 / scale;
- area->priv->crop.height = 96.0 / scale;
- area->priv->crop.x = (gdk_pixbuf_get_width (area->priv->browse_pixbuf) - area->priv->crop.width) / 2;
- area->priv->crop.y = (gdk_pixbuf_get_height (area->priv->browse_pixbuf) - area->priv->crop.height) / 2;
- }
-
- area->priv->scale = scale;
- area->priv->image.x = dest_x;
- area->priv->image.y = dest_y;
- area->priv->image.width = dest_width;
- area->priv->image.height = dest_height;
- }
+ GtkAllocation allocation;
+ GtkStyle *style;
+ GtkWidget *widget;
+ GdkColor *color;
+ gdouble scale;
+ gint width;
+ gint height;
+ gint dest_x, dest_y, dest_width, dest_height;
+ guint32 pixel;
+
+ widget = GTK_WIDGET (area);
+ gtk_widget_get_allocation (widget, &allocation);
+
+ if (area->priv->pixbuf == NULL ||
+ gdk_pixbuf_get_width (area->priv->pixbuf) != allocation.width ||
+ gdk_pixbuf_get_height (area->priv->pixbuf) != allocation.height)
+ {
+ if (area->priv->pixbuf != NULL)
+ g_object_unref (area->priv->pixbuf);
+ area->priv->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
+ allocation.width, allocation.height);
+
+ style = gtk_widget_get_style (widget);
+ color = &style->bg[gtk_widget_get_state (widget)];
+ pixel = ((color->red & 0xff00) << 16) |
+ ((color->green & 0xff00) << 8) |
+ (color->blue & 0xff00);
+ gdk_pixbuf_fill (area->priv->pixbuf, pixel);
+
+ width = gdk_pixbuf_get_width (area->priv->browse_pixbuf);
+ height = gdk_pixbuf_get_height (area->priv->browse_pixbuf);
+
+ scale = allocation.height / (gdouble) height;
+ if (scale * width > allocation.width)
+ scale = allocation.width / (gdouble) width;
+
+ dest_width = width * scale;
+ dest_height = height * scale;
+ dest_x = (allocation.width - dest_width) / 2;
+ dest_y = (allocation.height - dest_height) / 2,
+
+ gdk_pixbuf_scale (area->priv->browse_pixbuf,
+ area->priv->pixbuf,
+ dest_x, dest_y,
+ dest_width, dest_height,
+ dest_x, dest_y,
+ scale, scale,
+ GDK_INTERP_BILINEAR);
+
+ if (area->priv->color_shifted)
+ g_object_unref (area->priv->color_shifted);
+ area->priv->color_shifted = gdk_pixbuf_copy (area->priv->pixbuf);
+ shift_colors (area->priv->color_shifted, -32, -32, -32, 0);
+
+ if (area->priv->scale == 0.0)
+ {
+ area->priv->crop.width = 96.0 / scale;
+ area->priv->crop.height = 96.0 / scale;
+ area->priv->crop.x = (gdk_pixbuf_get_width (area->priv->browse_pixbuf) - area->priv->crop.width) / 2;
+ area->priv->crop.y = (gdk_pixbuf_get_height (area->priv->browse_pixbuf) - area->priv->crop.height) / 2;
+ }
+
+ area->priv->scale = scale;
+ area->priv->image.x = dest_x;
+ area->priv->image.y = dest_y;
+ area->priv->image.width = dest_width;
+ area->priv->image.height = dest_height;
+ }
}
static void
-crop_to_widget (UmCropArea *area,
- GdkRectangle *crop)
+crop_to_widget (UmCropArea *area,
+ GdkRectangle *crop)
{
- crop->x = area->priv->image.x + area->priv->crop.x * area->priv->scale;
- crop->y = area->priv->image.y + area->priv->crop.y * area->priv->scale;
- crop->width = area->priv->crop.width * area->priv->scale;
- crop->height = area->priv->crop.height * area->priv->scale;
+ crop->x = area->priv->image.x + area->priv->crop.x * area->priv->scale;
+ crop->y = area->priv->image.y + area->priv->crop.y * area->priv->scale;
+ crop->width = area->priv->crop.width * area->priv->scale;
+ crop->height = area->priv->crop.height * area->priv->scale;
}
-typedef enum {
- OUTSIDE,
- INSIDE,
- TOP,
- TOP_LEFT,
- TOP_RIGHT,
- BOTTOM,
- BOTTOM_LEFT,
- BOTTOM_RIGHT,
- LEFT,
- RIGHT
+typedef enum
+{
+ OUTSIDE,
+ INSIDE,
+ TOP,
+ TOP_LEFT,
+ TOP_RIGHT,
+ BOTTOM,
+ BOTTOM_LEFT,
+ BOTTOM_RIGHT,
+ LEFT,
+ RIGHT
} Location;
static gboolean
um_crop_area_expose (GtkWidget *widget,
- GdkEventExpose *event)
+ GdkEventExpose *event)
{
- GtkStateType state;
- GtkStyle *style;
- cairo_t *cr;
- GdkRectangle area;
- GdkRectangle crop;
- GdkWindow *window;
- gint width, height;
- UmCropArea *uarea = UM_CROP_AREA (widget);
-
- if (uarea->priv->browse_pixbuf == NULL)
- return FALSE;
-
- update_pixbufs (uarea);
-
- window = gtk_widget_get_window (widget);
- style = gtk_widget_get_style (widget);
- state = gtk_widget_get_state (widget);
-
- width = gdk_pixbuf_get_width (uarea->priv->pixbuf);
- height = gdk_pixbuf_get_height (uarea->priv->pixbuf);
- crop_to_widget (uarea, &crop);
-
- area.x = 0;
- area.y = 0;
- area.width = width;
- area.height = crop.y;
- gdk_rectangle_intersect (&area, &event->area, &area);
- gdk_draw_pixbuf (window,
- style->fg_gc[state],
- uarea->priv->color_shifted,
- area.x, area.y,
- area.x, area.y,
- area.width, area.height,
- GDK_RGB_DITHER_NONE, 0, 0);
-
- area.x = 0;
- area.y = crop.y;
- area.width = crop.x;
- area.height = crop.height;
- gdk_rectangle_intersect (&area, &event->area, &area);
- gdk_draw_pixbuf (window,
- style->fg_gc[state],
- uarea->priv->color_shifted,
- area.x, area.y,
- area.x, area.y,
- area.width, area.height,
- GDK_RGB_DITHER_NONE, 0, 0);
-
- area.x = crop.x;
- area.y = crop.y;
- area.width = crop.width;
- area.height = crop.height;
- gdk_rectangle_intersect (&area, &event->area, &area);
- gdk_draw_pixbuf (window,
- style->fg_gc[state],
- uarea->priv->pixbuf,
- area.x, area.y,
- area.x, area.y,
- area.width, area.height,
- GDK_RGB_DITHER_NONE, 0, 0);
-
- area.x = crop.x + crop.width;
- area.y = crop.y;
- area.width = width - area.x;
- area.height = crop.height;
- gdk_rectangle_intersect (&area, &event->area, &area);
- gdk_draw_pixbuf (window,
- style->fg_gc[state],
- uarea->priv->color_shifted,
- area.x, area.y,
- area.x, area.y,
- area.width, area.height,
- GDK_RGB_DITHER_NONE, 0, 0);
-
- area.x = 0;
- area.y = crop.y + crop.width;
- area.width = width;
- area.height = height - area.y;
- gdk_rectangle_intersect (&area, &event->area, &area);
- gdk_draw_pixbuf (window,
- style->fg_gc[state],
- uarea->priv->color_shifted,
- area.x, area.y,
- area.x, area.y,
- area.width, area.height,
- GDK_RGB_DITHER_NONE, 0, 0);
-
- cr = gdk_cairo_create (window);
- gdk_cairo_rectangle (cr, &event->area);
- cairo_clip (cr);
-
- if (uarea->priv->active_region != OUTSIDE) {
- gint x1, x2, y1, y2;
- gdk_cairo_set_source_color (cr, &style->white);
- cairo_set_line_width (cr, 1.0);
- x1 = crop.x + crop.width / 3.0;
- x2 = crop.x + 2 * crop.width / 3.0;
- y1 = crop.y + crop.height / 3.0;
- y2 = crop.y + 2 * crop.height / 3.0;
-
- cairo_move_to (cr, x1 + 0.5, crop.y);
- cairo_line_to (cr, x1 + 0.5, crop.y + crop.height);
-
- cairo_move_to (cr, x2 + 0.5, crop.y);
- cairo_line_to (cr, x2 + 0.5, crop.y + crop.height);
-
- cairo_move_to (cr, crop.x, y1 + 0.5);
- cairo_line_to (cr, crop.x + crop.width, y1 + 0.5);
-
- cairo_move_to (cr, crop.x, y2 + 0.5);
- cairo_line_to (cr, crop.x + crop.width, y2 + 0.5);
- cairo_stroke (cr);
- }
-
- gdk_cairo_set_source_color (cr, &style->black);
- cairo_set_line_width (cr, 1.0);
- cairo_rectangle (cr,
- crop.x + 0.5,
- crop.y + 0.5,
- crop.width - 1.0,
- crop.height - 1.0);
- cairo_stroke (cr);
-
- gdk_cairo_set_source_color (cr, &style->white);
- cairo_set_line_width (cr, 2.0);
- cairo_rectangle (cr,
- crop.x + 2.0,
- crop.y + 2.0,
- crop.width - 4.0,
- crop.height - 4.0);
- cairo_stroke (cr);
-
- cairo_destroy (cr);
-
- return FALSE;
+ GtkStateType state;
+ GtkStyle *style;
+ cairo_t *cr;
+ GdkRectangle area;
+ GdkRectangle crop;
+ GdkWindow *window;
+ gint width, height;
+ UmCropArea *uarea = UM_CROP_AREA (widget);
+
+ if (uarea->priv->browse_pixbuf == NULL)
+ return FALSE;
+
+ update_pixbufs (uarea);
+
+ window = gtk_widget_get_window (widget);
+ style = gtk_widget_get_style (widget);
+ state = gtk_widget_get_state (widget);
+
+ width = gdk_pixbuf_get_width (uarea->priv->pixbuf);
+ height = gdk_pixbuf_get_height (uarea->priv->pixbuf);
+ crop_to_widget (uarea, &crop);
+
+ area.x = 0;
+ area.y = 0;
+ area.width = width;
+ area.height = crop.y;
+ gdk_rectangle_intersect (&area, &event->area, &area);
+ gdk_draw_pixbuf (window,
+ style->fg_gc[state],
+ uarea->priv->color_shifted,
+ area.x, area.y,
+ area.x, area.y,
+ area.width, area.height,
+ GDK_RGB_DITHER_NONE, 0, 0);
+
+ area.x = 0;
+ area.y = crop.y;
+ area.width = crop.x;
+ area.height = crop.height;
+ gdk_rectangle_intersect (&area, &event->area, &area);
+ gdk_draw_pixbuf (window,
+ style->fg_gc[state],
+ uarea->priv->color_shifted,
+ area.x, area.y,
+ area.x, area.y,
+ area.width, area.height,
+ GDK_RGB_DITHER_NONE, 0, 0);
+
+ area.x = crop.x;
+ area.y = crop.y;
+ area.width = crop.width;
+ area.height = crop.height;
+ gdk_rectangle_intersect (&area, &event->area, &area);
+ gdk_draw_pixbuf (window,
+ style->fg_gc[state],
+ uarea->priv->pixbuf,
+ area.x, area.y,
+ area.x, area.y,
+ area.width, area.height,
+ GDK_RGB_DITHER_NONE, 0, 0);
+
+ area.x = crop.x + crop.width;
+ area.y = crop.y;
+ area.width = width - area.x;
+ area.height = crop.height;
+ gdk_rectangle_intersect (&area, &event->area, &area);
+ gdk_draw_pixbuf (window,
+ style->fg_gc[state],
+ uarea->priv->color_shifted,
+ area.x, area.y,
+ area.x, area.y,
+ area.width, area.height,
+ GDK_RGB_DITHER_NONE, 0, 0);
+
+ area.x = 0;
+ area.y = crop.y + crop.width;
+ area.width = width;
+ area.height = height - area.y;
+ gdk_rectangle_intersect (&area, &event->area, &area);
+ gdk_draw_pixbuf (window,
+ style->fg_gc[state],
+ uarea->priv->color_shifted,
+ area.x, area.y,
+ area.x, area.y,
+ area.width, area.height,
+ GDK_RGB_DITHER_NONE, 0, 0);
+
+ cr = gdk_cairo_create (window);
+ gdk_cairo_rectangle (cr, &event->area);
+ cairo_clip (cr);
+
+ if (uarea->priv->active_region != OUTSIDE)
+ {
+ gint x1, x2, y1, y2;
+ gdk_cairo_set_source_color (cr, &style->white);
+ cairo_set_line_width (cr, 1.0);
+ x1 = crop.x + crop.width / 3.0;
+ x2 = crop.x + 2 * crop.width / 3.0;
+ y1 = crop.y + crop.height / 3.0;
+ y2 = crop.y + 2 * crop.height / 3.0;
+
+ cairo_move_to (cr, x1 + 0.5, crop.y);
+ cairo_line_to (cr, x1 + 0.5, crop.y + crop.height);
+
+ cairo_move_to (cr, x2 + 0.5, crop.y);
+ cairo_line_to (cr, x2 + 0.5, crop.y + crop.height);
+
+ cairo_move_to (cr, crop.x, y1 + 0.5);
+ cairo_line_to (cr, crop.x + crop.width, y1 + 0.5);
+
+ cairo_move_to (cr, crop.x, y2 + 0.5);
+ cairo_line_to (cr, crop.x + crop.width, y2 + 0.5);
+ cairo_stroke (cr);
+ }
+
+ gdk_cairo_set_source_color (cr, &style->black);
+ cairo_set_line_width (cr, 1.0);
+ cairo_rectangle (cr,
+ crop.x + 0.5,
+ crop.y + 0.5,
+ crop.width - 1.0,
+ crop.height - 1.0);
+ cairo_stroke (cr);
+
+ gdk_cairo_set_source_color (cr, &style->white);
+ cairo_set_line_width (cr, 2.0);
+ cairo_rectangle (cr,
+ crop.x + 2.0,
+ crop.y + 2.0,
+ crop.width - 4.0,
+ crop.height - 4.0);
+ cairo_stroke (cr);
+
+ cairo_destroy (cr);
+
+ return FALSE;
}
-typedef enum {
- BELOW,
- LOWER,
- BETWEEN,
- UPPER,
- ABOVE
+typedef enum
+{
+ BELOW,
+ LOWER,
+ BETWEEN,
+ UPPER,
+ ABOVE
} Range;
static Range
@@ -330,323 +338,332 @@ find_range (gint x,
gint min,
gint max)
{
- gint tolerance = 12;
-
- if (x < min - tolerance)
- return BELOW;
- if (x <= min + tolerance)
- return LOWER;
- if (x < max - tolerance)
- return BETWEEN;
- if (x <= max + tolerance)
- return UPPER;
- return ABOVE;
+ gint tolerance = 12;
+
+ if (x < min - tolerance)
+ return BELOW;
+ if (x <= min + tolerance)
+ return LOWER;
+ if (x < max - tolerance)
+ return BETWEEN;
+ if (x <= max + tolerance)
+ return UPPER;
+ return ABOVE;
}
static Location
find_location (GdkRectangle *rect,
- gint x,
- gint y)
+ gint x,
+ gint y)
{
- Range x_range, y_range;
- Location location[5][5] = {
- { OUTSIDE, OUTSIDE, OUTSIDE, OUTSIDE, OUTSIDE },
- { OUTSIDE, TOP_LEFT, TOP, TOP_RIGHT, OUTSIDE },
- { OUTSIDE, LEFT, INSIDE, RIGHT, OUTSIDE },
- { OUTSIDE, BOTTOM_LEFT, BOTTOM, BOTTOM_RIGHT, OUTSIDE },
- { OUTSIDE, OUTSIDE, OUTSIDE, OUTSIDE, OUTSIDE }
- };
-
- x_range = find_range (x, rect->x, rect->x + rect->width);
- y_range = find_range (y, rect->y, rect->y + rect->height);
-
- return location[y_range][x_range];
+ Range x_range, y_range;
+ Location location[5][5] = {
+ {OUTSIDE, OUTSIDE, OUTSIDE, OUTSIDE, OUTSIDE},
+ {OUTSIDE, TOP_LEFT, TOP, TOP_RIGHT, OUTSIDE},
+ {OUTSIDE, LEFT, INSIDE, RIGHT, OUTSIDE},
+ {OUTSIDE, BOTTOM_LEFT, BOTTOM, BOTTOM_RIGHT, OUTSIDE},
+ {OUTSIDE, OUTSIDE, OUTSIDE, OUTSIDE, OUTSIDE}
+ };
+
+ x_range = find_range (x, rect->x, rect->x + rect->width);
+ y_range = find_range (y, rect->y, rect->y + rect->height);
+
+ return location[y_range][x_range];
}
static void
update_cursor (UmCropArea *area,
- gint x,
- gint y)
+ gint x,
+ gint y)
{
- gint cursor_type;
- GdkRectangle crop;
-
- crop_to_widget (area, &crop);
-
- switch (find_location (&crop, x, y)) {
- case OUTSIDE:
- cursor_type = GDK_LEFT_PTR;
- break;
- case TOP_LEFT:
- cursor_type = GDK_TOP_LEFT_CORNER;
- break;
- case TOP:
- cursor_type = GDK_TOP_SIDE;
- break;
- case TOP_RIGHT:
- cursor_type = GDK_TOP_RIGHT_CORNER;
- break;
- case LEFT:
- cursor_type = GDK_LEFT_SIDE;
- break;
- case INSIDE:
- cursor_type = GDK_FLEUR;
- break;
- case RIGHT:
- cursor_type = GDK_RIGHT_SIDE;
- break;
- case BOTTOM_LEFT:
- cursor_type = GDK_BOTTOM_LEFT_CORNER;
- break;
- case BOTTOM:
- cursor_type = GDK_BOTTOM_SIDE;
- break;
- case BOTTOM_RIGHT:
- cursor_type = GDK_BOTTOM_RIGHT_CORNER;
- break;
- }
-
- if (cursor_type != area->priv->current_cursor) {
- GdkCursor *cursor = gdk_cursor_new (cursor_type);
- gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (area)), cursor);
- gdk_cursor_unref (cursor);
- area->priv->current_cursor = cursor_type;
- }
+ gint cursor_type;
+ GdkRectangle crop;
+
+ crop_to_widget (area, &crop);
+
+ switch (find_location (&crop, x, y))
+ {
+ case OUTSIDE:
+ cursor_type = GDK_LEFT_PTR;
+ break;
+ case TOP_LEFT:
+ cursor_type = GDK_TOP_LEFT_CORNER;
+ break;
+ case TOP:
+ cursor_type = GDK_TOP_SIDE;
+ break;
+ case TOP_RIGHT:
+ cursor_type = GDK_TOP_RIGHT_CORNER;
+ break;
+ case LEFT:
+ cursor_type = GDK_LEFT_SIDE;
+ break;
+ case INSIDE:
+ cursor_type = GDK_FLEUR;
+ break;
+ case RIGHT:
+ cursor_type = GDK_RIGHT_SIDE;
+ break;
+ case BOTTOM_LEFT:
+ cursor_type = GDK_BOTTOM_LEFT_CORNER;
+ break;
+ case BOTTOM:
+ cursor_type = GDK_BOTTOM_SIDE;
+ break;
+ case BOTTOM_RIGHT:
+ cursor_type = GDK_BOTTOM_RIGHT_CORNER;
+ break;
+ }
+
+ if (cursor_type != area->priv->current_cursor)
+ {
+ GdkCursor *cursor = gdk_cursor_new (cursor_type);
+ gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (area)), cursor);
+ gdk_cursor_unref (cursor);
+ area->priv->current_cursor = cursor_type;
+ }
}
-static gboolean
+static gboolean
um_crop_area_motion_notify_event (GtkWidget *widget,
- GdkEventMotion *event)
+ GdkEventMotion *event)
{
- gint x, y;
- gint x2, y2;
- gint delta_x, delta_y;
- gint width, height, d;
- UmCropArea *area = UM_CROP_AREA (widget);
-
- width = gdk_pixbuf_get_width (area->priv->browse_pixbuf);
- height = gdk_pixbuf_get_height (area->priv->browse_pixbuf);
-
- x = (event->x - area->priv->image.x) / area->priv->scale;
- y = (event->y - area->priv->image.y) / area->priv->scale;
- x = CLAMP (x, 0, width);
- y = CLAMP (y, 0, height);
-
- delta_x = x - area->priv->last_press_x;
- delta_y = y - area->priv->last_press_y;
- area->priv->last_press_x = x;
- area->priv->last_press_y = y;
-
- x2 = area->priv->crop.x + area->priv->crop.width;
- y2 = area->priv->crop.y + area->priv->crop.height;
-
- switch (area->priv->active_region) {
- case INSIDE:
- area->priv->crop.x = CLAMP (area->priv->crop.x + delta_x, 0, width - area->priv->crop.width);
- area->priv->crop.y = CLAMP (area->priv->crop.y + delta_y, 0, height - area->priv->crop.height);
- break;
-
- case TOP_LEFT:
- d = MAX (x2 - x, y2 - y);
- if (d < 48 / area->priv->scale)
- d = 48 / area->priv->scale;
- if (x2 - d < 0)
- d = x2;
- if (y2 - d < 0)
- d = y2;
- area->priv->crop.x = x2 - d;
- area->priv->crop.y = y2 - d;
- area->priv->crop.width = area->priv->crop.height = d;
- break;
-
- case TOP:
- case TOP_RIGHT:
- d = MAX (y2 - y, x - area->priv->crop.x);
- if (d < 48 / area->priv->scale)
- d = 48 / area->priv->scale;
- if (area->priv->crop.x + d > width)
- d = width - area->priv->crop.x;
- if (y2 - d < 0)
- d = y2;
- area->priv->crop.y = y2 - d;
- area->priv->crop.width = area->priv->crop.height = d;
- break;
-
- case LEFT:
- case BOTTOM_LEFT:
- d = MAX (x2 - x, y - area->priv->crop.y);
- if (d < 48 / area->priv->scale)
- d = 48 / area->priv->scale;
- if (area->priv->crop.y + d > height)
- d = height - area->priv->crop.y;
- if (x2 - d < 0)
- d = x2;
- area->priv->crop.x = x2 - d;
- area->priv->crop.width = area->priv->crop.height = d;
- break;
-
- case RIGHT:
- case BOTTOM_RIGHT:
- case BOTTOM:
- area->priv->crop.width = MAX (x - area->priv->crop.x, y - area->priv->crop.y);
- if (area->priv->crop.width < 48 / area->priv->scale)
- area->priv->crop.width = 48 / area->priv->scale;
- if (area->priv->crop.x + area->priv->crop.width > width)
- area->priv->crop.width = width - area->priv->crop.x;
- area->priv->crop.height = area->priv->crop.width;
- if (area->priv->crop.y + area->priv->crop.height > height)
- area->priv->crop.height = height - area->priv->crop.y;
- area->priv->crop.width = area->priv->crop.height;
- break;
-
- case OUTSIDE:
- break;
- default: ;
- }
-
- update_cursor (area, event->x, event->y);
- gtk_widget_queue_draw (widget);
-
- return FALSE;
+ gint x, y;
+ gint x2, y2;
+ gint delta_x, delta_y;
+ gint width, height, d;
+ UmCropArea *area = UM_CROP_AREA (widget);
+
+ width = gdk_pixbuf_get_width (area->priv->browse_pixbuf);
+ height = gdk_pixbuf_get_height (area->priv->browse_pixbuf);
+
+ x = (event->x - area->priv->image.x) / area->priv->scale;
+ y = (event->y - area->priv->image.y) / area->priv->scale;
+ x = CLAMP (x, 0, width);
+ y = CLAMP (y, 0, height);
+
+ delta_x = x - area->priv->last_press_x;
+ delta_y = y - area->priv->last_press_y;
+ area->priv->last_press_x = x;
+ area->priv->last_press_y = y;
+
+ x2 = area->priv->crop.x + area->priv->crop.width;
+ y2 = area->priv->crop.y + area->priv->crop.height;
+
+ switch (area->priv->active_region)
+ {
+ case INSIDE:
+ area->priv->crop.x = CLAMP (area->priv->crop.x + delta_x, 0, width - area->priv->crop.width);
+ area->priv->crop.y = CLAMP (area->priv->crop.y + delta_y, 0, height - area->priv->crop.height);
+ break;
+
+ case TOP_LEFT:
+ d = MAX (x2 - x, y2 - y);
+ if (d < 48 / area->priv->scale)
+ d = 48 / area->priv->scale;
+ if (x2 - d < 0)
+ d = x2;
+ if (y2 - d < 0)
+ d = y2;
+ area->priv->crop.x = x2 - d;
+ area->priv->crop.y = y2 - d;
+ area->priv->crop.width = area->priv->crop.height = d;
+ break;
+
+ case TOP:
+ case TOP_RIGHT:
+ d = MAX (y2 - y, x - area->priv->crop.x);
+ if (d < 48 / area->priv->scale)
+ d = 48 / area->priv->scale;
+ if (area->priv->crop.x + d > width)
+ d = width - area->priv->crop.x;
+ if (y2 - d < 0)
+ d = y2;
+ area->priv->crop.y = y2 - d;
+ area->priv->crop.width = area->priv->crop.height = d;
+ break;
+
+ case LEFT:
+ case BOTTOM_LEFT:
+ d = MAX (x2 - x, y - area->priv->crop.y);
+ if (d < 48 / area->priv->scale)
+ d = 48 / area->priv->scale;
+ if (area->priv->crop.y + d > height)
+ d = height - area->priv->crop.y;
+ if (x2 - d < 0)
+ d = x2;
+ area->priv->crop.x = x2 - d;
+ area->priv->crop.width = area->priv->crop.height = d;
+ break;
+
+ case RIGHT:
+ case BOTTOM_RIGHT:
+ case BOTTOM:
+ area->priv->crop.width = MAX (x - area->priv->crop.x, y - area->priv->crop.y);
+ if (area->priv->crop.width < 48 / area->priv->scale)
+ area->priv->crop.width = 48 / area->priv->scale;
+ if (area->priv->crop.x + area->priv->crop.width > width)
+ area->priv->crop.width = width - area->priv->crop.x;
+ area->priv->crop.height = area->priv->crop.width;
+ if (area->priv->crop.y + area->priv->crop.height > height)
+ area->priv->crop.height = height - area->priv->crop.y;
+ area->priv->crop.width = area->priv->crop.height;
+ break;
+
+ case OUTSIDE:
+ break;
+ default:;
+ }
+
+ update_cursor (area, event->x, event->y);
+ gtk_widget_queue_draw (widget);
+
+ return FALSE;
}
static gboolean
um_crop_area_button_press_event (GtkWidget *widget,
- GdkEventButton *event)
+ GdkEventButton *event)
{
- GdkRectangle crop;
- UmCropArea *area = UM_CROP_AREA (widget);
+ GdkRectangle crop;
+ UmCropArea *area = UM_CROP_AREA (widget);
- crop_to_widget (area, &crop);
+ crop_to_widget (area, &crop);
- area->priv->last_press_x = (event->x - area->priv->image.x) / area->priv->scale;
- area->priv->last_press_y = (event->y - area->priv->image.y) / area->priv->scale;
- area->priv->active_region = find_location (&crop, event->x, event->y);
+ area->priv->last_press_x = (event->x - area->priv->image.x) / area->priv->scale;
+ area->priv->last_press_y = (event->y - area->priv->image.y) / area->priv->scale;
+ area->priv->active_region = find_location (&crop, event->x, event->y);
- gtk_widget_queue_draw (widget);
+ gtk_widget_queue_draw (widget);
- return FALSE;
+ return FALSE;
}
static gboolean
um_crop_area_button_release_event (GtkWidget *widget,
- GdkEventButton *event)
+ GdkEventButton *event)
{
- UmCropArea *area = UM_CROP_AREA (widget);
+ UmCropArea *area = UM_CROP_AREA (widget);
- area->priv->last_press_x = -1;
- area->priv->last_press_y = -1;
- area->priv->active_region = OUTSIDE;
+ area->priv->last_press_x = -1;
+ area->priv->last_press_y = -1;
+ area->priv->active_region = OUTSIDE;
- gtk_widget_queue_draw (widget);
+ gtk_widget_queue_draw (widget);
- return FALSE;
+ return FALSE;
}
static void
um_crop_area_finalize (GObject *object)
{
- UmCropArea *area = UM_CROP_AREA (object);
-
- if (area->priv->browse_pixbuf) {
- g_object_unref (area->priv->browse_pixbuf);
- area->priv->browse_pixbuf = NULL;
- }
- if (area->priv->pixbuf) {
- g_object_unref (area->priv->pixbuf);
- area->priv->pixbuf = NULL;
- }
- if (area->priv->color_shifted) {
- g_object_unref (area->priv->color_shifted);
- area->priv->color_shifted = NULL;
- }
+ UmCropArea *area = UM_CROP_AREA (object);
+
+ if (area->priv->browse_pixbuf)
+ {
+ g_object_unref (area->priv->browse_pixbuf);
+ area->priv->browse_pixbuf = NULL;
+ }
+ if (area->priv->pixbuf)
+ {
+ g_object_unref (area->priv->pixbuf);
+ area->priv->pixbuf = NULL;
+ }
+ if (area->priv->color_shifted)
+ {
+ g_object_unref (area->priv->color_shifted);
+ area->priv->color_shifted = NULL;
+ }
}
static void
um_crop_area_class_init (UmCropAreaClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
- object_class->finalize = um_crop_area_finalize;
- widget_class->expose_event = um_crop_area_expose;
- widget_class->button_press_event = um_crop_area_button_press_event;
- widget_class->button_release_event = um_crop_area_button_release_event;
- widget_class->motion_notify_event = um_crop_area_motion_notify_event;
+ object_class->finalize = um_crop_area_finalize;
+ widget_class->expose_event = um_crop_area_expose;
+ widget_class->button_press_event = um_crop_area_button_press_event;
+ widget_class->button_release_event = um_crop_area_button_release_event;
+ widget_class->motion_notify_event = um_crop_area_motion_notify_event;
- g_type_class_add_private (klass, sizeof (UmCropAreaPrivate));
+ g_type_class_add_private (klass, sizeof (UmCropAreaPrivate));
}
static void
um_crop_area_init (UmCropArea *area)
{
- area->priv = (G_TYPE_INSTANCE_GET_PRIVATE ((area), UM_TYPE_CROP_AREA,
- UmCropAreaPrivate));
-
- gtk_widget_add_events (GTK_WIDGET (area), GDK_POINTER_MOTION_MASK |
- GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK);
-
- area->priv->scale = 0.0;
- area->priv->image.x = 0;
- area->priv->image.y = 0;
- area->priv->image.width = 0;
- area->priv->image.height = 0;
- area->priv->active_region = OUTSIDE;
+ area->priv = (G_TYPE_INSTANCE_GET_PRIVATE ((area), UM_TYPE_CROP_AREA,
+ UmCropAreaPrivate));
+
+ gtk_widget_add_events (GTK_WIDGET (area), GDK_POINTER_MOTION_MASK |
+ GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK);
+
+ area->priv->scale = 0.0;
+ area->priv->image.x = 0;
+ area->priv->image.y = 0;
+ area->priv->image.width = 0;
+ area->priv->image.height = 0;
+ area->priv->active_region = OUTSIDE;
}
GtkWidget *
um_crop_area_new (void)
{
- return g_object_new (UM_TYPE_CROP_AREA, NULL);
+ return g_object_new (UM_TYPE_CROP_AREA, NULL);
}
GdkPixbuf *
um_crop_area_get_picture (UmCropArea *area)
{
- return gdk_pixbuf_new_subpixbuf (area->priv->browse_pixbuf,
- area->priv->crop.x, area->priv->crop.y,
- area->priv->crop.width, area->priv->crop.height);
+ return gdk_pixbuf_new_subpixbuf (area->priv->browse_pixbuf,
+ area->priv->crop.x, area->priv->crop.y,
+ area->priv->crop.width, area->priv->crop.height);
}
void
um_crop_area_set_picture (UmCropArea *area,
- GdkPixbuf *pixbuf)
+ GdkPixbuf *pixbuf)
{
- int width;
- int height;
-
- if (area->priv->browse_pixbuf) {
- g_object_unref (area->priv->browse_pixbuf);
- area->priv->browse_pixbuf = NULL;
- }
- if (pixbuf) {
- area->priv->browse_pixbuf = g_object_ref (pixbuf);
- width = gdk_pixbuf_get_width (pixbuf);
- height = gdk_pixbuf_get_height (pixbuf);
- } else {
- width = 0;
- height = 0;
- }
+ int width;
+ int height;
+
+ if (area->priv->browse_pixbuf)
+ {
+ g_object_unref (area->priv->browse_pixbuf);
+ area->priv->browse_pixbuf = NULL;
+ }
+ if (pixbuf)
+ {
+ area->priv->browse_pixbuf = g_object_ref (pixbuf);
+ width = gdk_pixbuf_get_width (pixbuf);
+ height = gdk_pixbuf_get_height (pixbuf);
+ }
+ else
+ {
+ width = 0;
+ height = 0;
+ }
#if 0
- gtk_widget_get_allocation (um->browse_drawing_area, &allocation);
- um->priv->crop.width = 96;
- um->priv->crop.height = 96;
- um->priv->crop.x = (allocation.width - um->priv->crop.width) / 2;
- um->priv->crop.y = (allocation.height - um->priv->crop.height) / 2;
+ gtk_widget_get_allocation (um->browse_drawing_area, &allocation);
+ um->priv->crop.width = 96;
+ um->priv->crop.height = 96;
+ um->priv->crop.x = (allocation.width - um->priv->crop.width) / 2;
+ um->priv->crop.y = (allocation.height - um->priv->crop.height) / 2;
#else
- area->priv->crop.width = 96;
- area->priv->crop.height = 96;
- area->priv->crop.x = (width - area->priv->crop.width) / 2;
- area->priv->crop.y = (height - area->priv->crop.height) / 2;
+ area->priv->crop.width = 96;
+ area->priv->crop.height = 96;
+ area->priv->crop.x = (width - area->priv->crop.width) / 2;
+ area->priv->crop.y = (height - area->priv->crop.height) / 2;
#endif
- area->priv->scale = 0.0;
- area->priv->image.x = 0;
- area->priv->image.y = 0;
- area->priv->image.width = 0;
- area->priv->image.height = 0;
+ area->priv->scale = 0.0;
+ area->priv->image.x = 0;
+ area->priv->image.y = 0;
+ area->priv->image.width = 0;
+ area->priv->image.height = 0;
- gtk_widget_queue_draw (GTK_WIDGET (area));
+ gtk_widget_queue_draw (GTK_WIDGET (area));
}
-
diff --git a/libcheese/um-crop-area.h b/libcheese/um-crop-area.h
index c1767ad..6db90f8 100644
--- a/libcheese/um-crop-area.h
+++ b/libcheese/um-crop-area.h
@@ -27,13 +27,13 @@ G_BEGIN_DECLS
#define UM_TYPE_CROP_AREA (um_crop_area_get_type ())
#define UM_CROP_AREA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), UM_TYPE_CROP_AREA, \
- UmCropArea))
+ UmCropArea))
#define UM_CROP_AREA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UM_TYPE_CROP_AREA, \
- UmCropAreaClass))
+ UmCropAreaClass))
#define UM_IS_CROP_AREA(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UM_TYPE_CROP_AREA))
#define UM_IS_CROP_AREA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UM_TYPE_CROP_AREA))
#define UM_CROP_AREA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), UM_TYPE_CROP_AREA, \
- UmCropAreaClass))
+ UmCropAreaClass))
typedef struct _UmCropAreaClass UmCropAreaClass;
typedef struct _UmCropArea UmCropArea;
@@ -54,8 +54,8 @@ GType um_crop_area_get_type (void) G_GNUC_CONST;
GtkWidget *um_crop_area_new (void);
GdkPixbuf *um_crop_area_get_picture (UmCropArea *area);
-void um_crop_area_set_picture (UmCropArea *area,
- GdkPixbuf *pixbuf);
+void um_crop_area_set_picture (UmCropArea *area,
+ GdkPixbuf *pixbuf);
G_END_DECLS
diff --git a/po/LINGUAS b/po/LINGUAS
index 4deb723..c292952 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -33,6 +33,7 @@ id
it
ja
ka
+kk
kn
ko
ku
@@ -56,6 +57,7 @@ pt
pt_BR
ro
ru
+sk
sl
sq
sr
@@ -65,6 +67,7 @@ ta
te
th
tr
+ug
uk
vi
zh_CN
diff --git a/po/ar.po b/po/ar.po
index 47d82a4..5eb2287 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -3,15 +3,14 @@
# Copyright (C) 2007 THE gnome'S COPYRIGHT HOLDER
# This file is distributed under the same license as the gnome package.
# Automatically generated, 2007.
-# Khaled Hosny <khaledhosny eglug org>, 2008.,2009
# Usama Akkad <uak aya sy>, 2008.
-# Khaled Hosny <khaledhosny eglug org>, 2009
+# Khaled Hosny <khaledhosny eglug org>, 2008, 2009, 2010.
msgid ""
msgstr ""
"Project-Id-Version: cheese.HEAD.ar.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-02 16:35+0200\n"
-"PO-Revision-Date: 2009-09-02 16:35+0300\n"
+"POT-Creation-Date: 2010-10-19 15:47+0200\n"
+"PO-Revision-Date: 2010-10-19 15:46+0300\n"
"Last-Translator: Khaled Hosny <khaledhosny eglug org>\n"
"Language-Team: Arabic <doc arabeyes org>\n"
"MIME-Version: 1.0\n"
@@ -19,17 +18,217 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Language: ar\n"
"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"
-"X-Generator: Virtaal 0.4.0\n"
+"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"X-Generator: Virtaal 0.6.1\n"
-#: ../data/cheese.desktop.in.in.h:1
-msgid "Cheese Webcam Booth"
-msgstr "غرÙ?Ø© Ù?Ù?رة اÙ?Ù?ب «ابتسÙ?»"
+#: ../data/cheese-about.ui.h:1 ../data/cheese.desktop.in.in.h:1
+#: ../src/cheese-main.vala:102
+msgid "Cheese"
+msgstr "«ابتسÙ?»"
-#: ../data/cheese.desktop.in.in.h:2 ../src/cheese-window.c:1089
+#: ../data/cheese-about.ui.h:2
+msgid "Cheese Website"
+msgstr "Ù?Ù?Ù?ع Ø´Ù?ز"
+
+#: ../data/cheese-about.ui.h:3 ../data/cheese.desktop.in.in.h:3
msgid "Take photos and videos with your webcam, with fun graphical effects"
msgstr "اÙ?تÙ?Ø· صÙ?ر Ù? Ù?Ù?دÙ?Ù? Ù?Ù? Ù?اÙ?Ù?را اÙ?Ù?بØ? Ù?ع Ù?ؤثرات رسÙ?Ù?Ù?Ø©"
+#: ../data/cheese-about.ui.h:4
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see http://www.gnu.org/licenses/\n";
+msgstr ""
+"Ù?ذا اÙ?برÙ?اÙ?ج ØرØ? بإÙ?Ù?اÙ?Ù? إعادة تÙ?زÙ?عÙ? Ù?/Ø£Ù? تعدÙ?Ù?Ù? تØت شرÙ?Ø· اÙ?رخصة اÙ?عÙ?Ù?Ù?Ù?Ø© "
+"اÙ?عاÙ?Ø© Ù?جÙ?Ù? Ù?اÙ?تÙ? Ù?شرتÙ?ا Ù?Ù?ظÙ?Ø© اÙ?برÙ?جÙ?ات اÙ?ØرةØ? سÙ?اء اÙ?إصدارة 2 Ù?Ù? اÙ?رخصة Ø£Ù? "
+"Ø£Ù? إصدارة بعدÙ?ا Øسب رغبتÙ?.\n"
+"\n"
+"Ù?Ù?زÙ?ع Ù?ذا اÙ?برÙ?اÙ?ج عÙ?Ù? Ø£Ù?Ù? Ø£Ù? Ù?Ù?Ù?Ù? Ù?Ù?Ù?دÙ?ا Ù?Ù?Ù? Ù?ستخدÙ?Ù? دÙ?Ù? أدÙ?Ù? Ù?سؤÙ?Ù?Ù?Ø©Ø? Ù?Ù?ا "
+"ØتÙ? Ø£Ù? ضÙ?اÙ? Ù?ضÙ?Ù? صÙ?اØÙ?Ø© اÙ?عرض Ù?Ù? اÙ?سÙ?Ù? Ø£Ù? تÙ?اÙ?Ù?Ù? Ù?ع Ø£Ù? استخداÙ? Ù?Øدد. Ù?Ù?Ù?Ù?Ù? "
+"Ù?راجعة اÙ?رخصة اÙ?عÙ?Ù?Ù?Ù?Ø© اÙ?عاÙ?Ø© Ù?جÙ?Ù? Ù?Ù?زÙ?د Ù?Ù? اÙ?تÙ?اصÙ?Ù?.\n"
+"\n"
+"Ù?Ù? اÙ?Ù?Ù?ترض Ø£Ù? تÙ?Ù?Ù? Ù?د استÙ?Ù?ت Ù?سخة Ù?Ù? رخصة جÙ?Ù? اÙ?عاÙ?Ø© Ù?ع اÙ?برÙ?اÙ?جØ? Ù?Ø¥Ù?ا "
+"Ù?اÙ?ظر:\n"
+"http://www.gnu.org/licenses/\n";
+
+#: ../data/cheese-about.ui.h:10
+msgid "translator-credits"
+msgstr ""
+"Ù?رÙ?Ù? عربآÙ?ز Ù?Ù?ترجÙ?Ø© http://www.arabeyes.org :\n"
+"جÙ?اد عÙ?Ù?Ù?Ù?\t<djihed gmail com>\n"
+"خاÙ?د ØسÙ?Ù?\t<khaledhosny eglug org>"
+
+#: ../data/cheese-actions.ui.h:1
+#, fuzzy
+msgid "Burst"
+msgstr "_تÙ?رارÙ?"
+
+#: ../data/cheese-actions.ui.h:2
+#, fuzzy
+msgid "Fullscreen"
+msgstr "غادر _Ù?Ù?Ø¡ اÙ?شاشة"
+
+#: ../data/cheese-actions.ui.h:3
+#, fuzzy
+msgid "Help _Contents"
+msgstr "اÙ?Ù?_ØتÙ?Ù?ات"
+
+#: ../data/cheese-actions.ui.h:4
+msgid "Move All to Trash"
+msgstr "اÙ?Ù?Ù? اÙ?Ù?Ù? Ø¥Ù?Ù? اÙ?Ù?Ù?Ù?Ù?ات"
+
+#: ../data/cheese-actions.ui.h:5
+msgid "Move to _Trash"
+msgstr "اÙ?Ù?Ù? Ø¥Ù?Ù? اÙ?_Ù?Ù?Ù?Ù?ات"
+
+#: ../data/cheese-actions.ui.h:6
+#, fuzzy
+msgid "Next Effects"
+msgstr "Ù?ا Ù?ؤثرات"
+
+#: ../data/cheese-actions.ui.h:7
+#, fuzzy
+msgid "Previous Effects"
+msgstr "Ù?ا Ù?ؤثرات"
+
+#: ../data/cheese-actions.ui.h:8
+#, fuzzy
+msgid "Save _As"
+msgstr "اØÙ?ظ با_سÙ?â?¦"
+
+#: ../data/cheese-actions.ui.h:9
+#, fuzzy
+msgid "Take _Multiple Photos"
+msgstr "اÙ?_تÙ?Ø· عدة صÙ?ر"
+
+#: ../data/cheese-actions.ui.h:10
+#, fuzzy
+msgid "_About"
+msgstr "عÙ?Ù?"
+
+#: ../data/cheese-actions.ui.h:11
+msgid "_Cheese"
+msgstr "ابت_سÙ?"
+
+#: ../data/cheese-actions.ui.h:12
+#, fuzzy
+msgid "_Delete"
+msgstr "اØØ°Ù?"
+
+#: ../data/cheese-actions.ui.h:13
+msgid "_Edit"
+msgstr "ت_ØرÙ?ر"
+
+#: ../data/cheese-actions.ui.h:14 ../data/cheese-main-window.ui.h:1
+msgid "_Effects"
+msgstr "اÙ?Ù?ؤث_رات"
+
+#: ../data/cheese-actions.ui.h:15
+msgid "_Help"
+msgstr "Ù?_ساعدة"
+
+#: ../data/cheese-actions.ui.h:16
+msgid "_Open"
+msgstr "ا_Ù?تØ"
+
+#: ../data/cheese-actions.ui.h:17
+msgid "_Photo"
+msgstr "_صÙ?رة"
+
+#: ../data/cheese-actions.ui.h:18
+#, fuzzy
+msgid "_Preferences"
+msgstr "اÙ?تÙ?ضÙ?Ù?ات"
+
+#: ../data/cheese-actions.ui.h:19
+#, fuzzy
+msgid "_Quit"
+msgstr "اخرج"
+
+#: ../data/cheese-actions.ui.h:20
+#, fuzzy
+msgid "_Record a Video"
+msgstr "اÙ?ت_سجÙ?Ù?"
+
+#: ../data/cheese-actions.ui.h:21 ../data/cheese-main-window.ui.h:3
+msgid "_Take a Photo"
+msgstr "اÙ?_تÙ?Ø· صÙ?رة"
+
+#: ../data/cheese-actions.ui.h:22
+msgid "_Video"
+msgstr "_Ù?Ù?دÙ?Ù?"
+
+#: ../data/cheese-actions.ui.h:23
+#, fuzzy
+msgid "_Wide Mode"
+msgstr "اÙ?Ù?_ضع اÙ?Ù?اسع"
+
+#: ../data/cheese-main-window.ui.h:2
+msgid "_Leave Fullscreen"
+msgstr "غادر _Ù?Ù?Ø¡ اÙ?شاشة"
+
+#: ../data/cheese-prefs.ui.h:1
+msgid "Brightness"
+msgstr "اÙ?سطÙ?ع"
+
+#: ../data/cheese-prefs.ui.h:2
+msgid "Burst mode"
+msgstr "اÙ?Ù?ضع اÙ?تÙ?رارÙ?"
+
+#: ../data/cheese-prefs.ui.h:3
+msgid "Contrast"
+msgstr "اÙ?تباÙ?Ù?"
+
+#: ../data/cheese-prefs.ui.h:4
+msgid "Delay between photos (seconds)"
+msgstr "اÙ?تأخÙ?ر بÙ?Ù? اÙ?صÙ?ر (باÙ?Ø«Ù?اÙ?Ù?)"
+
+#: ../data/cheese-prefs.ui.h:5
+msgid "Device"
+msgstr "اÙ?جÙ?از"
+
+#: ../data/cheese-prefs.ui.h:6
+msgid "Hue"
+msgstr "اÙ?تدرج"
+
+#: ../data/cheese-prefs.ui.h:7
+msgid "Image properties"
+msgstr "خصائص اÙ?صÙ?رة"
+
+#: ../data/cheese-prefs.ui.h:8
+msgid "Number of photos"
+msgstr "عدد اÙ?صÙ?ر"
+
+#: ../data/cheese-prefs.ui.h:9
+msgid "Preferences"
+msgstr "اÙ?تÙ?ضÙ?Ù?ات"
+
+#: ../data/cheese-prefs.ui.h:10
+msgid "Resolution"
+msgstr "اÙ?Ù?Ù?ز"
+
+#: ../data/cheese-prefs.ui.h:11
+msgid "Saturation"
+msgstr "اÙ?تشبع"
+
+#: ../data/cheese-prefs.ui.h:12
+msgid "Webcam"
+msgstr "Ù?Ù?رة اÙ?Ù?ب"
+
+#: ../data/cheese.desktop.in.in.h:2
+msgid "Cheese Webcam Booth"
+msgstr "غرÙ?Ø© Ù?Ù?رة اÙ?Ù?ب «ابتسÙ?»"
+
#. Translators: please note, that the effect names are
#. standarized and should not be translated
#: ../data/cheese.schemas.in.h:3
@@ -43,48 +242,52 @@ msgstr ""
"\"shagadelic\"Ø? \"vertigo\"Ø? \"edge\"Ø? \"dice\" Ù? \"warp\""
#: ../data/cheese.schemas.in.h:4
-msgid "Adjusts brightness level of the picture coming from the webcam"
-msgstr "Ù?ضبط Ù?ستÙ?Ù? سطÙ?ع اÙ?صÙ?ر اÙ?Ù?ادÙ?Ø© Ù?Ù? Ù?Ù?رة اÙ?Ù?ب"
+msgid "Adjusts brightness level of the picture coming from the camera"
+msgstr "Ù?ضبط Ù?ستÙ?Ù? سطÙ?ع اÙ?صÙ?ر اÙ?Ù?ادÙ?Ø© Ù?Ù? اÙ?Ù?Ù?رة"
#: ../data/cheese.schemas.in.h:5
-msgid "Adjusts contrast level of the picture coming from the webcam"
-msgstr "Ù?ضبط Ù?ستÙ?Ù? تباÙ?Ù? اÙ?صÙ?ر اÙ?Ù?ادÙ?Ø© Ù?Ù? Ù?Ù?رة اÙ?Ù?ب"
+msgid "Adjusts contrast level of the picture coming from the camera"
+msgstr "Ù?ضبط Ù?ستÙ?Ù? تباÙ?Ù? اÙ?صÙ?ر اÙ?Ù?ادÙ?Ø© Ù?Ù? اÙ?Ù?Ù?رة"
#: ../data/cheese.schemas.in.h:6
-msgid "Adjusts hue level of the picture coming from the webcam"
-msgstr "Ù?ضبط Ù?ستÙ?Ù? تدرÙ?ج اÙ?صÙ?ر اÙ?Ù?ادÙ?Ø© Ù?Ù? Ù?Ù?رة اÙ?Ù?ب"
+msgid "Adjusts hue level of the picture coming from the camera"
+msgstr "Ù?ضبط Ù?ستÙ?Ù? تدرÙ?ج اÙ?صÙ?ر اÙ?Ù?ادÙ?Ø© Ù?Ù? اÙ?Ù?Ù?رة"
#: ../data/cheese.schemas.in.h:7
-msgid "Adjusts saturation level of the picture coming from the webcam"
-msgstr "Ù?ضبط Ù?ستÙ?Ù? تشبع اÙ?صÙ?ر اÙ?Ù?ادÙ?Ø© Ù?Ù? Ù?Ù?رة اÙ?Ù?ب"
+msgid "Adjusts saturation level of the picture coming from the camera"
+msgstr "Ù?ضبط Ù?ستÙ?Ù? تشبع اÙ?صÙ?ر اÙ?Ù?ادÙ?Ø© Ù?Ù? اÙ?Ù?Ù?رة"
#: ../data/cheese.schemas.in.h:8
+msgid "Camera device string indicator"
+msgstr "Ù?Ù?Ø¶Ø Ù?ص جÙ?از اÙ?Ù?Ù?رة"
+
+#: ../data/cheese.schemas.in.h:9
msgid ""
"Defines the path where the photos are stored, if empty \"XDG_PHOTO/Webcam\" "
"will be used."
msgstr ""
"Ù?ØدÙ?د اÙ?Ù?سار اÙ?Ø°Ù? تخزÙ? Ù?Ù?Ù? اÙ?صÙ?رØ? Ø¥Ù? تÙ?رÙ? Ù?ارغا سÙ?ستخدÙ? \"XDG_PHOTO/Webcam\"."
-#: ../data/cheese.schemas.in.h:9
+#: ../data/cheese.schemas.in.h:10
msgid ""
"Defines the path where the videos are stored, if empty \"XDG_VIDEO/Webcam\" "
"will be used."
msgstr ""
"Ù?عرÙ? اÙ?Ù?سار اÙ?Ø°Ù? Ù?خزÙ? Ù?Ù?Ù? اÙ?صÙ?رØ? إذا Ù?اÙ? Ù?ارغا سÙ?ستخدÙ? \"XDG_VIDEO/Webcam\"."
-#: ../data/cheese.schemas.in.h:10
+#: ../data/cheese.schemas.in.h:11
msgid "Height resolution"
msgstr "Ù?Ù?ز اÙ?ارتÙ?اع"
-#: ../data/cheese.schemas.in.h:11
+#: ../data/cheese.schemas.in.h:12
msgid ""
-"If set to true, Cheese will startup in a wide mode with the image collection "
-"placed on the right side. Useful with small screens."
+"If set to true, Cheese will start up in a wide mode with the image "
+"collection placed on the right-hand side. Useful with small screens."
msgstr ""
"إذا ضÙ?بط Ù?صØÙ?Ø Ù?سÙ?بدأ «ابتسÙ?» Ù?Ù? اÙ?Ù?ضع اÙ?Ù?اسع Ù?ع Ù?ضع Ù?جÙ?Ù?عة اÙ?صÙ?ر عÙ?Ù? اÙ?Ù?Ù?Ù?Ù?. "
"Ù?Ù?اسب Ù?Ù?شاشات اÙ?صغÙ?رة."
-#: ../data/cheese.schemas.in.h:12
+#: ../data/cheese.schemas.in.h:13
msgid ""
"If set to true, then Cheese will have a feature allowing you to delete a "
"file immediately and in-place, instead of moving it to the trash. This "
@@ -93,76 +296,72 @@ msgstr ""
"Ø¥Ù? عÙ?Ù?Ù?Ù? Ù?صØÙ?ØØ? سÙ?Ù?Ù?Ù?Ù? «ابتسÙ?» Ù?Ù? ØØ°Ù? اÙ?Ù?Ù?Ù? Ù?باشرة Ù? Ù?Ù? Ù?Ù?اÙ?Ù?Ø? بدÙ?ا Ù?Ù? Ù?Ù?Ù?Ù? Ø¥Ù?Ù? "
"اÙ?Ù?Ù?Ù?Ù?ات. Ù?Ø°Ù? اÙ?Ù?Ù?زة خطرةØ? Ù?ذا استعÙ?Ù?Ù?ا بØذر."
-#: ../data/cheese.schemas.in.h:13
+#: ../data/cheese.schemas.in.h:14
msgid "Milliseconds between photos in burst mode."
msgstr "اÙ?Ù?Ù?Ù? Ø«Ù?اÙ?Ù? بÙ?Ù? اÙ?صÙ?ر Ù?Ù? اÙ?Ù?ضع اÙ?تÙ?رارÙ?."
-#: ../data/cheese.schemas.in.h:14
+#: ../data/cheese.schemas.in.h:15
msgid "Number of photos in burst mode."
msgstr "عدد اÙ?صÙ?ر Ù?Ù? اÙ?Ù?ضع اÙ?تÙ?رارÙ?."
-#: ../data/cheese.schemas.in.h:15
+#: ../data/cheese.schemas.in.h:16
msgid "Photo Path"
msgstr "Ù?سار اÙ?صÙ?رة"
-#: ../data/cheese.schemas.in.h:16
+#: ../data/cheese.schemas.in.h:17
msgid "Picture brightness"
msgstr "سطÙ?ع اÙ?صÙ?رة"
-#: ../data/cheese.schemas.in.h:17
+#: ../data/cheese.schemas.in.h:18
msgid "Picture contrast"
msgstr "تباÙ?Ù? اÙ?صÙ?رة"
-#: ../data/cheese.schemas.in.h:18
+#: ../data/cheese.schemas.in.h:19
msgid "Picture hue"
msgstr "تدرÙ?ج اÙ?صÙ?رة"
-#: ../data/cheese.schemas.in.h:19
+#: ../data/cheese.schemas.in.h:20
msgid "Picture saturation"
msgstr "تشبع اÙ?صÙ?رة"
-#: ../data/cheese.schemas.in.h:20
+#: ../data/cheese.schemas.in.h:21
msgid "Selected Effects"
msgstr "اÙ?Ù?ؤثرات اÙ?Ù?ختارة"
-#: ../data/cheese.schemas.in.h:21
+#: ../data/cheese.schemas.in.h:22
msgid "Set to True to show countdown when taking a photo"
msgstr "عÙ?Ù?Ù? Ù?صØÙ?Ø Ù?عرض اÙ?عد اÙ?تÙ?ازÙ?Ù? عÙ?د أخذ صÙ?رة"
-#: ../data/cheese.schemas.in.h:22
-msgid "The device which points to the webcam (e.g. /dev/video0)"
-msgstr "اÙ?جÙ?از اÙ?Ø°Ù? Ù?Ø´Ù?ر Ù?Ù?Ù?رة اÙ?Ù?ب (Ù?ثاÙ? â?ª/dev/video0â?¬)"
-
#: ../data/cheese.schemas.in.h:23
+msgid "The device which points to the camera (e.g. /dev/video0)"
+msgstr "اÙ?جÙ?از اÙ?Ø°Ù? Ù?Ø´Ù?ر Ù?Ù?Ù?Ù?رة (Ù?ثاÙ? â?ª/dev/video0â?¬)"
+
+#: ../data/cheese.schemas.in.h:24
msgid "The height resolution of the image captured from the camera"
msgstr "Ù?Ù?ز اÙ?ارتÙ?اع Ù?Ù?صÙ?رة اÙ?Ù?Ù?تÙ?طة باÙ?Ù?Ù?رة"
-#: ../data/cheese.schemas.in.h:24
+#: ../data/cheese.schemas.in.h:25
msgid ""
"The length of time, in milliseconds, to delay between taking each photo in a "
"burst sequence of photos."
msgstr "Ù?Ù?ت اÙ?تأخÙ?ر -باÙ?Ù?Ù?Ù? ثاÙ?Ù?Ø©- بÙ?Ù? أخذ اÙ?صÙ?ر Ù?Ù? اÙ?Ù?ضع اÙ?تÙ?رارÙ?."
-#: ../data/cheese.schemas.in.h:25
+#: ../data/cheese.schemas.in.h:26
msgid "The number of photos to take in a single burst."
msgstr "عدد اÙ?صÙ?ر اÙ?Ù?أخÙ?ذة Ù?Ù? Ù?رة تÙ?رارÙ?Ø© Ù?اØدة."
-#: ../data/cheese.schemas.in.h:26
+#: ../data/cheese.schemas.in.h:27
msgid "The width resolution of the image captured from the camera"
msgstr "Ù?Ù?ز اÙ?عرض Ù?Ù?صÙ?رة اÙ?Ù?Ù?تÙ?طة باÙ?Ù?اÙ?رة"
-#: ../data/cheese.schemas.in.h:27
+#: ../data/cheese.schemas.in.h:28
msgid "Use a countdown"
msgstr "استعÙ?Ù? اÙ?عدÙ? اÙ?عÙ?سÙ?"
-#: ../data/cheese.schemas.in.h:28
+#: ../data/cheese.schemas.in.h:29
msgid "Video Path"
msgstr "Ù?سار اÙ?Ù?Ù?دÙ?Ù?"
-#: ../data/cheese.schemas.in.h:29
-msgid "Webcam device string indicator"
-msgstr "Ù?Ù?Ø¶Ø Ù?ص اÙ?جÙ?از"
-
#: ../data/cheese.schemas.in.h:30
msgid "Whether to enable immediate deletion"
msgstr "إذا Ù?ا سÙ?Ù?عÙ?Ù? اÙ?ØØ°Ù? اÙ?Ù?Ù?رÙ?"
@@ -175,131 +374,47 @@ msgstr "إذا Ù?ا سÙ?بدأ Ù?Ù? اÙ?Ù?ضع اÙ?Ù?اسع"
msgid "Width resolution"
msgstr "Ù?Ù?ز اÙ?عرض"
-#: ../data/cheese.ui.h:1 ../src/cheese.c:184
-msgid "Cheese"
-msgstr "«ابتسÙ?»"
-
-#: ../data/cheese.ui.h:2
-msgid "Switch to Burst Mode"
-msgstr "اÙ?تÙ?Ù? Ù?Ù?Ù?ضع اÙ?تÙ?رارÙ?"
-
-#: ../data/cheese.ui.h:3
-msgid "Switch to Photo Mode"
-msgstr "اÙ?تÙ?Ù? Ù?Ù?ضع اÙ?صÙ?رة"
-
-#: ../data/cheese.ui.h:4
-msgid "Switch to Video Mode"
-msgstr "اÙ?تÙ?Ù? Ù?Ù?ضع اÙ?Ù?Ù?دÙ?Ù?"
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.vala:594
+msgid "Shutter sound"
+msgstr "صÙ?ت اÙ?غاÙ?Ù?"
-#: ../data/cheese.ui.h:5
-msgid "Switch to the Effects Selector"
-msgstr "اÙ?تÙ?Ù? Ù?Ù?Ù?تÙ?Ù? اÙ?Ù?ؤثرات"
-
-#: ../data/cheese.ui.h:6 ../src/cheese-window.c:1213
-#: ../src/cheese-window.c:1501
-msgid "_Effects"
-msgstr "اÙ?Ù?ؤث_رات"
+#: ../libcheese/cheese-avatar-chooser.c:238
+msgid "Take a photo"
+msgstr "اÙ?تÙ?Ø· صÙ?رة"
-#: ../data/cheese.ui.h:7
-msgid "_Leave Fullscreen"
-msgstr "غادر _Ù?Ù?Ø¡ اÙ?شاشة"
-
-#: ../data/cheese.ui.h:8 ../src/cheese-window.c:1534
-#: ../src/cheese-window.c:1574
-msgid "_Take a Photo"
-msgstr "اÙ?_تÙ?Ø· صÙ?رة"
-
-#: ../data/cheese-prefs.ui.h:1
-msgid "Brightness"
-msgstr "اÙ?سطÙ?ع"
-
-#: ../data/cheese-prefs.ui.h:2
-msgid "Burst mode"
-msgstr "اÙ?Ù?ضع اÙ?تÙ?رارÙ?"
-
-#: ../data/cheese-prefs.ui.h:3
-msgid "Contrast"
-msgstr "اÙ?تباÙ?Ù?"
-
-#: ../data/cheese-prefs.ui.h:4
-msgid "Delay between photos (secs.)"
-msgstr "اÙ?تأخÙ?ر بÙ?Ù? اÙ?صÙ?ر (باÙ?Ø«Ù?اÙ?Ù?)"
-
-#: ../data/cheese-prefs.ui.h:5
-msgid "Device"
-msgstr "اÙ?جÙ?از"
-
-#: ../data/cheese-prefs.ui.h:6
-msgid "Hue"
-msgstr "اÙ?تدرج"
-
-#: ../data/cheese-prefs.ui.h:7
-msgid "Image properties"
-msgstr "خصائص اÙ?صÙ?رة"
-
-#: ../data/cheese-prefs.ui.h:8
-msgid "Number of photos"
-msgstr "عدد اÙ?صÙ?ر"
-
-#: ../data/cheese-prefs.ui.h:9 ../src/cheese-window.c:1505
-msgid "Preferences"
-msgstr "اÙ?تÙ?ضÙ?Ù?ات"
-
-#: ../data/cheese-prefs.ui.h:10
-msgid "Resolution"
-msgstr "اÙ?Ù?Ù?ز"
-
-#: ../data/cheese-prefs.ui.h:11 ../src/cheese-effect-chooser.c:66
-msgid "Saturation"
-msgstr "اÙ?تشبع"
-
-#: ../data/cheese-prefs.ui.h:12
-msgid "Webcam"
-msgstr "Ù?Ù?رة اÙ?Ù?ب"
-
-#: ../src/cheese-effect-chooser.c:60
-msgid "No Effect"
-msgstr "Ù?ا Ù?ؤثرات"
-
-#: ../src/cheese-effect-chooser.c:62
-msgid "Mauve"
-msgstr "بÙ?Ù?سجÙ?"
-
-#: ../src/cheese-effect-chooser.c:64
-msgid "Noir/Blanc"
-msgstr "أسÙ?د/أبÙ?ض"
-
-#: ../src/cheese-effect-chooser.c:68
-msgid "Hulk"
-msgstr "Ù?Ù?Ù?Ù?"
+#: ../libcheese/cheese-avatar-chooser.c:257
+msgid "_Take a photo"
+msgstr "ا_Ù?تÙ?Ø· صÙ?رة"
-#: ../src/cheese-effect-chooser.c:70
-msgid "Vertical Flip"
-msgstr "Ù?Ù?ب رأسÙ?"
+#: ../libcheese/cheese-avatar-chooser.c:272
+msgid "_Discard photo"
+msgstr "ا_Ù?بذ اÙ?صÙ?رة"
-#: ../src/cheese-effect-chooser.c:72
-msgid "Horizontal Flip"
-msgstr "Ù?Ù?ب Ø£Ù?Ù?Ù?"
+#: ../libcheese/cheese-camera-device.c:329
+msgid "Device capabilities not supported"
+msgstr "Ø¥Ù?Ù?اÙ?Ù?ات اÙ?جÙ?از غÙ?ر Ù?دعÙ?Ù?Ø©"
-#: ../src/cheese-effect-chooser.c:74
-msgid "Shagadelic"
-msgstr "Ù?Ø«Ù?ر"
+#: ../libcheese/cheese-camera-device.c:357
+#, c-format
+msgid "Failed to initialize device %s for capability probing"
+msgstr ""
-#: ../src/cheese-effect-chooser.c:76
-msgid "Vertigo"
-msgstr "دÙ?ار"
+#: ../libcheese/cheese-camera-device.c:515
+msgid "Unknown device"
+msgstr "جÙ?از Ù?جÙ?Ù?Ù?"
-#: ../src/cheese-effect-chooser.c:78
-msgid "Edge"
-msgstr "ØاÙ?Ø©"
+#: ../libcheese/cheese-camera-device.c:539
+msgid "Cancellable initialization not supported"
+msgstr "اÙ?استبداء اÙ?Ù?ابÙ? Ù?Ù?Ø¥Ù?غاء غÙ?ر Ù?دعÙ?Ù?"
-#: ../src/cheese-effect-chooser.c:80
-msgid "Dice"
-msgstr "Ù?رد"
+#: ../libcheese/cheese-camera.c:1156
+#, c-format
+msgid "No device found"
+msgstr "Ù?Ù? Ù?Ù?عثر عÙ?Ù? Ø£Ù? جÙ?از"
-#: ../src/cheese-effect-chooser.c:82
-msgid "Warp"
-msgstr "Ø·Ù?"
+#: ../libcheese/cheese-camera.c:1175
+msgid "One or more needed GStreamer elements are missing: "
+msgstr "عÙ?صر Ø£Ù? Ø£Ù?ثر Ù?Ù? عÙ?اصر GStreamer Ù?Ù?Ù?Ù?دة:"
#. TRANSLATORS:
#. * This is the countdown number when taking the photo.
@@ -307,286 +422,239 @@ msgstr "Ø·Ù?"
#. * To enable to show the numbers in your own language, use %Id instead.
#. * Please leave the additional whitespace after the number
#.
-#: ../src/cheese-countdown.c:436 ../src/cheese-countdown.c:455
-#: ../src/cheese-countdown.c:474
+#: ../libcheese/cheese-countdown.c:441 ../libcheese/cheese-countdown.c:460
+#: ../libcheese/cheese-countdown.c:479
#, c-format
msgid "%d "
msgstr "%Id "
-#: ../src/cheese-no-camera.c:93
-msgid "No camera found!"
-msgstr "Ù?Ù? Ù?جد Ù?Ù?رة!"
+#: ../src/cheese-effects-manager.vala:116
+msgid "No Effect"
+msgstr "Ù?ا Ù?ؤثرات"
-#: ../src/cheese-no-camera.c:94
-msgid "Please refer to the help for further information."
-msgstr "راجع اÙ?Ù?ساعدة Ù?Ù?زÙ?د Ù?Ù? اÙ?Ù?عÙ?Ù?Ù?ات."
+#: ../src/cheese-main.vala:37
+msgid "Enable wide mode"
+msgstr "Ù?عÙ?Ù? اÙ?Ù?ضع اÙ?Ù?اسع"
-#: ../src/cheese-webcam.c:1660
-msgid "One or more needed gstreamer elements are missing: "
-msgstr "عÙ?صر Ø£Ù? Ø£Ù?ثر Ù?Ù? عÙ?اصر gstreamer Ù?Ù?Ù?Ù?دة:"
+#: ../src/cheese-main.vala:38
+msgid "Device to use as a camera"
+msgstr ""
-#: ../src/cheese-window.c:80
-msgid "_Skip"
-msgstr "ت_خطÙ?"
+#: ../src/cheese-main.vala:38
+msgid "DEVICE"
+msgstr ""
-#: ../src/cheese-window.c:81
-msgid "S_kip All"
-msgstr "_تخطÙ? اÙ?Ù?Ù?"
+#: ../src/cheese-main.vala:39
+#, fuzzy
+msgid "Output version information and exit"
+msgstr "اÙ?تب رÙ?Ù? اÙ?إصدار Ø«Ù? اخرج"
-#: ../src/cheese-window.c:82
-msgid "Delete _All"
-msgstr "اØØ°Ù? اÙ?_Ù?Ù?"
+#: ../src/cheese-main.vala:66
+#, fuzzy
+msgid "- Take photos and videos from your webcam"
+msgstr "- اÙ?تÙ?Ø· صÙ?را Ù?Ù?Ù?دÙ?Ù? بÙ?اÙ?Ù?را اÙ?Ù?بØ? Ù?ع تأثÙ?رات رسÙ?Ù?Ù?Ø© Ù?رØØ©"
-#: ../src/cheese-window.c:539
+#: ../src/cheese-main.vala:77
#, c-format
-msgid ""
-"Failed to launch program to show:\n"
-"%s\n"
-"%s"
+msgid "Run '%s --help' to see a full list of available command line options.\n"
msgstr ""
-"Ù?Ø´Ù? تÙ?Ù?Ù?Ø° برÙ?اÙ?ج Ù?عرض:\n"
-"%s\n"
-"%s"
-#: ../src/cheese-window.c:560
-msgid "Save File"
-msgstr "اØÙ?ظ اÙ?Ù?Ù?Ù?"
+#: ../src/cheese-window.vala:689
+#, fuzzy
+msgid "Stop _Recording"
+msgstr "Ø£Ù?_Ù?Ù? اÙ?تسجÙ?Ù?"
-#: ../src/cheese-window.c:598
-#, c-format
-msgid "Could not save %s"
-msgstr "تعذÙ?ر ØÙ?ظ %s"
+#: ../src/cheese-window.vala:821
+#, fuzzy
+msgid "No effects found"
+msgstr "Ù?Ù? Ù?Ù?عثر عÙ?Ù? Ø£Ù? جÙ?از"
-#: ../src/cheese-window.c:621
-msgid "Error while deleting"
-msgstr "خطأ عÙ?د اÙ?ØØ°Ù?"
+#~ msgid "Set to True to use flash when taking a photo"
+#~ msgstr "عÙ?Ù?Ù? Ù?صØÙ?Ø Ù?Ù?Ù?Ù?ض عÙ?د أخذ صÙ?رة"
-#: ../src/cheese-window.c:622
-#, c-format
-msgid "The file \"%s\" cannot be deleted. Details: %s"
-msgstr "Ù?ا Ù?Ù?Ù?Ù? ØØ°Ù? اÙ?Ù?Ù?Ù? \"%s\". تÙ?اصÙ?Ù?: %s"
+#~ msgid "Use a flash"
+#~ msgstr "Ø£Ù?Ù?ض"
-#: ../src/cheese-window.c:649
-#, c-format
-msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural ""
-"Are you sure you want to permanently delete the %'d selected items?"
-msgstr[0] "Ø£Ù?تاÙ?د Ù?Ù? رغبتÙ? بØØ°Ù? اÙ?عÙ?صر اÙ?Ù?Øدد (%d)Ø?"
-msgstr[1] "Ø£Ù?تاÙ?د Ù?Ù? رغبتÙ? بØØ°Ù? اÙ?عÙ?صر اÙ?Ù?Øدد (%d)Ø?"
-msgstr[2] "Ø£Ù?تاÙ?د Ù?Ù? رغبتÙ? بØØ°Ù? اÙ?عÙ?صرÙ?Ù? اÙ?Ù?ØددÙ?Ù? (%d)Ø?"
-msgstr[3] "Ø£Ù?تاÙ?د Ù?Ù? رغبتÙ? بØØ°Ù? اÙ?â??%'d اÙ?عÙ?اصر اÙ?Ù?ØددةØ?"
-msgstr[4] "Ø£Ù?تاÙ?د Ù?Ù? رغبتÙ? بØØ°Ù? اÙ?â??%'d عÙ?صرا اÙ?Ù?ØددةØ?"
-msgstr[5] "Ø£Ù?تاÙ?د Ù?Ù? رغبتÙ? بØØ°Ù? اÙ?â??%'d عÙ?صر اÙ?Ù?ØددةØ?"
-
-#: ../src/cheese-window.c:656
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\"?"
-msgstr "Ø£Ù?تأÙ?د Ù?Ù? رغبتÙ? بØØ°Ù? \"%s\" Ù?Ù?ائÙ?اØ?"
+#~ msgid "Switch to Burst Mode"
+#~ msgstr "اÙ?تÙ?Ù? Ù?Ù?Ù?ضع اÙ?تÙ?رارÙ?"
-#: ../src/cheese-window.c:659
-#, c-format
-msgid "If you delete an item, it will be permanently lost."
-msgstr "Ø¥Ù? ØØ°Ù?ت عÙ?صراØ? سÙ?Ù?Ù?د Ù?Ù?ائÙ?ا."
+#~ msgid "Switch to Photo Mode"
+#~ msgstr "اÙ?تÙ?Ù? Ù?Ù?ضع اÙ?صÙ?رة"
-#: ../src/cheese-window.c:680
-msgid "Unknown Error"
-msgstr "خطأ Ù?جÙ?Ù?Ù?"
+#~ msgid "Switch to Video Mode"
+#~ msgstr "اÙ?تÙ?Ù? Ù?Ù?ضع اÙ?Ù?Ù?دÙ?Ù?"
-#: ../src/cheese-window.c:710
-msgid "Cannot move file to trash, do you want to delete immediately?"
-msgstr "Ù?ا Ù?Ù?Ù?Ù? Ù?Ù?Ù? اÙ?Ù?Ù?Ù? Ù?Ù?Ù?Ù?Ù?Ù?اتØ? Ù?Ù? ترغب بØØ°Ù?Ù? Ù?Ù?راØ?"
+#~ msgid "Switch to the Effects Selector"
+#~ msgstr "اÙ?تÙ?Ù? Ù?Ù?Ù?تÙ?Ù? اÙ?Ù?ؤثرات"
-#: ../src/cheese-window.c:711
-#, c-format
-msgid "The file \"%s\" cannot be moved to the trash. Details: %s"
-msgstr "تعذÙ?ر Ù?Ù?Ù? اÙ?Ù?Ù?Ù? \"%s\" Ø¥Ù?Ù? اÙ?Ù?Ù?Ù?Ù?ات. اÙ?تÙ?اصÙ?Ù?: %s "
+#~ msgid "_Skip"
+#~ msgstr "ت_خطÙ?"
-#: ../src/cheese-window.c:783
-#, c-format
-msgid "Really move all photos and videos to the trash?"
-msgstr "أأÙ?Ù?Ù? Ù?عÙ?ا Ù?Ù? اÙ?صÙ?ر Ù?اÙ?Ù?Ù?دÙ?Ù? Ø¥Ù?Ù? اÙ?Ù?Ù?Ù?Ù?اتØ?"
+#~ msgid "S_kip All"
+#~ msgstr "_تخطÙ? اÙ?Ù?Ù?"
-#: ../src/cheese-window.c:791
-msgid "_Move to Trash"
-msgstr "ا_Ù?Ù?Ù? Ø¥Ù?Ù? اÙ?Ù?Ù?Ù?Ù?ات"
+#~ msgid "Delete _All"
+#~ msgstr "اØØ°Ù? اÙ?_Ù?Ù?"
-#: ../src/cheese-window.c:909
-#, c-format
-msgid "Could not set the Account Photo"
-msgstr "تعذÙ?ر Ù?ضع صÙ?رة اÙ?Øساب"
+#~ msgid ""
+#~ "Failed to launch program to show:\n"
+#~ "%s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ù?Ø´Ù? تÙ?Ù?Ù?Ø° برÙ?اÙ?ج Ù?عرض:\n"
+#~ "%s\n"
+#~ "%s"
-#: ../src/cheese-window.c:941
-msgid "Media files"
-msgstr "Ù?Ù?Ù?ات Ù?سائط"
+#~ msgid "Save File"
+#~ msgstr "اØÙ?ظ اÙ?Ù?Ù?Ù?"
-#: ../src/cheese-window.c:1015 ../src/cheese-window.c:1295
-msgid "Unable to open help file for Cheese"
-msgstr "تعذÙ?ر Ù?ØªØ Ù?Ù?Ù? اÙ?Ù?ساعدة"
+#~ msgid "Could not save %s"
+#~ msgstr "تعذÙ?ر ØÙ?ظ %s"
-#: ../src/cheese-window.c:1067
-msgid "translator-credits"
-msgstr ""
-"Ù?رÙ?Ù? عربآÙ?ز Ù?Ù?ترجÙ?Ø© http://www.arabeyes.org :\n"
-"جÙ?اد عÙ?Ù?Ù?Ù?\t<djihed gmail com>\n"
-"خاÙ?د ØسÙ?Ù?\t<khaledhosny eglug org>"
+#~ msgid "Error while deleting"
+#~ msgstr "خطأ عÙ?د اÙ?ØØ°Ù?"
-#: ../src/cheese-window.c:1070
-msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-msgstr ""
-"Ù?ذا اÙ?برÙ?اÙ?ج ØرØ? بإÙ?Ù?اÙ?Ù? إعادة تÙ?زÙ?عÙ? Ù?/Ø£Ù? تعدÙ?Ù?Ù? تØت شرÙ?Ø· اÙ?رخصة اÙ?عÙ?Ù?Ù?Ù?Ø© "
-"اÙ?عاÙ?Ø© Ù?جÙ?Ù? Ù?اÙ?تÙ? Ù?شرتÙ?ا Ù?Ù?ظÙ?Ø© اÙ?برÙ?جÙ?ات اÙ?ØرةØ? سÙ?اء اÙ?إصدارة 2 Ù?Ù? اÙ?رخصة Ø£Ù? "
-"Ø£Ù? إصدارة بعدÙ?ا Øسب رغبتÙ?.\n"
+#~ msgid "The file \"%s\" cannot be deleted. Details: %s"
+#~ msgstr "Ù?ا Ù?Ù?Ù?Ù? ØØ°Ù? اÙ?Ù?Ù?Ù? \"%s\". تÙ?اصÙ?Ù?: %s"
-#: ../src/cheese-window.c:1074
-msgid ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-msgstr ""
-"Ù?Ù?زÙ?ع Ù?ذا اÙ?برÙ?اÙ?ج عÙ?Ù? Ø£Ù?Ù? Ø£Ù? Ù?Ù?Ù?Ù? Ù?Ù?Ù?دÙ?ا Ù?Ù?Ù? Ù?ستخدÙ?Ù? دÙ?Ù? أدÙ?Ù? Ù?سؤÙ?Ù?Ù?Ø©Ø? Ù?Ù?ا "
-"ØتÙ? Ø£Ù? ضÙ?اÙ? Ù?ضÙ?Ù? صÙ?اØÙ?Ø© اÙ?عرض Ù?Ù? اÙ?سÙ?Ù? Ø£Ù? تÙ?اÙ?Ù?Ù? Ù?ع Ø£Ù? استخداÙ? Ù?Øدد. Ù?Ù?Ù?Ù?Ù? "
-"Ù?راجعة اÙ?رخصة اÙ?عÙ?Ù?Ù?Ù?Ø© اÙ?عاÙ?Ø© Ù?جÙ?Ù? Ù?Ù?زÙ?د Ù?Ù? اÙ?تÙ?اصÙ?Ù?.\n"
+#~ msgid "Are you sure you want to permanently delete the %'d selected item?"
+#~ msgid_plural ""
+#~ "Are you sure you want to permanently delete the %'d selected items?"
+#~ msgstr[0] "Ø£Ù?تاÙ?د Ù?Ù? رغبتÙ? بØØ°Ù? اÙ?عÙ?صر اÙ?Ù?Øدد (%d)Ø?"
+#~ msgstr[1] "Ø£Ù?تاÙ?د Ù?Ù? رغبتÙ? بØØ°Ù? اÙ?عÙ?صر اÙ?Ù?Øدد (%d)Ø?"
+#~ msgstr[2] "Ø£Ù?تاÙ?د Ù?Ù? رغبتÙ? بØØ°Ù? اÙ?عÙ?صرÙ?Ù? اÙ?Ù?ØددÙ?Ù? (%d)Ø?"
+#~ msgstr[3] "Ø£Ù?تاÙ?د Ù?Ù? رغبتÙ? بØØ°Ù? اÙ?â??%'d اÙ?عÙ?اصر اÙ?Ù?ØددةØ?"
+#~ msgstr[4] "Ø£Ù?تاÙ?د Ù?Ù? رغبتÙ? بØØ°Ù? اÙ?â??%'d عÙ?صرا اÙ?Ù?ØددةØ?"
+#~ msgstr[5] "Ø£Ù?تاÙ?د Ù?Ù? رغبتÙ? بØØ°Ù? اÙ?â??%'d عÙ?صر اÙ?Ù?ØددةØ?"
-#: ../src/cheese-window.c:1078
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr ""
-"Ù?Ù? اÙ?Ù?Ù?ترض Ø£Ù? تÙ?Ù?Ù? Ù?د استÙ?Ù?ت Ù?سخة Ù?Ù? رخصة جÙ?Ù? اÙ?عاÙ?Ø© Ù?ع اÙ?برÙ?اÙ?جØ? Ù?Ù? ØاÙ? عدÙ? "
-"استÙ?اÙ?Ù? Ù?Ø°Ù?Ù?Ø? Ù?Ù?Ù?Ù?Ù? تصÙ?Ø <http://www.gnu.org/licenses/>."
+#~ msgid "Are you sure you want to permanently delete \"%s\"?"
+#~ msgstr "Ø£Ù?تأÙ?د Ù?Ù? رغبتÙ? بØØ°Ù? \"%s\" Ù?Ù?ائÙ?اØ?"
-#: ../src/cheese-window.c:1095
-msgid "Cheese Website"
-msgstr "Ù?Ù?Ù?ع Ø´Ù?ز"
+#~ msgid "If you delete an item, it will be permanently lost."
+#~ msgstr "Ø¥Ù? ØØ°Ù?ت عÙ?صراØ? سÙ?Ù?Ù?د Ù?Ù?ائÙ?ا."
-#: ../src/cheese-window.c:1311
-msgid "_Start Recording"
-msgstr "ا_بدأ اÙ?تسجÙ?Ù?"
+#~ msgid "Unknown Error"
+#~ msgstr "خطأ Ù?جÙ?Ù?Ù?"
-#: ../src/cheese-window.c:1447
-msgid "_Stop Recording"
-msgstr "Ø£Ù?_Ù?Ù? اÙ?تسجÙ?Ù?"
+#~ msgid "Cannot move file to trash, do you want to delete immediately?"
+#~ msgstr "Ù?ا Ù?Ù?Ù?Ù? Ù?Ù?Ù? اÙ?Ù?Ù?Ù? Ù?Ù?Ù?Ù?Ù?Ù?اتØ? Ù?Ù? ترغب بØØ°Ù?Ù? Ù?Ù?راØ?"
-#: ../src/cheese-window.c:1482
-msgid "_Cheese"
-msgstr "ابت_سÙ?"
+#~ msgid "The file \"%s\" cannot be moved to the trash. Details: %s"
+#~ msgstr "تعذÙ?ر Ù?Ù?Ù? اÙ?Ù?Ù?Ù? \"%s\" Ø¥Ù?Ù? اÙ?Ù?Ù?Ù?Ù?ات. اÙ?تÙ?اصÙ?Ù?: %s "
-#: ../src/cheese-window.c:1484
-msgid "_Edit"
-msgstr "ت_ØرÙ?ر"
+#~ msgid "Really move all photos and videos to the trash?"
+#~ msgstr "أأÙ?Ù?Ù? Ù?عÙ?ا Ù?Ù? اÙ?صÙ?ر Ù?اÙ?Ù?Ù?دÙ?Ù? Ø¥Ù?Ù? اÙ?Ù?Ù?Ù?Ù?اتØ?"
-#: ../src/cheese-window.c:1485
-msgid "Move All to Trash"
-msgstr "اÙ?Ù?Ù? اÙ?Ù?Ù? Ø¥Ù?Ù? اÙ?Ù?Ù?Ù?Ù?ات"
+#~ msgid "_Move to Trash"
+#~ msgstr "ا_Ù?Ù?Ù? Ø¥Ù?Ù? اÙ?Ù?Ù?Ù?Ù?ات"
-#: ../src/cheese-window.c:1488
-msgid "_Help"
-msgstr "Ù?_ساعدة"
+#~ msgid "Unable to open help file for Cheese"
+#~ msgstr "تعذÙ?ر Ù?ØªØ Ù?Ù?Ù? اÙ?Ù?ساعدة"
-#: ../src/cheese-window.c:1491
-msgid "_Contents"
-msgstr "اÙ?Ù?_ØتÙ?Ù?ات"
+#~ msgid ""
+#~ "This program is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ msgstr ""
+#~ "Ù?ذا اÙ?برÙ?اÙ?ج ØرØ? بإÙ?Ù?اÙ?Ù? إعادة تÙ?زÙ?عÙ? Ù?/Ø£Ù? تعدÙ?Ù?Ù? تØت شرÙ?Ø· اÙ?رخصة "
+#~ "اÙ?عÙ?Ù?Ù?Ù?Ø© اÙ?عاÙ?Ø© Ù?جÙ?Ù? Ù?اÙ?تÙ? Ù?شرتÙ?ا Ù?Ù?ظÙ?Ø© اÙ?برÙ?جÙ?ات اÙ?ØرةØ? سÙ?اء اÙ?إصدارة 2 "
+#~ "Ù?Ù? اÙ?رخصة Ø£Ù? Ø£Ù? إصدارة بعدÙ?ا Øسب رغبتÙ?.\n"
-#: ../src/cheese-window.c:1491
-msgid "Help on this Application"
-msgstr "Ù?ساعدة ØÙ?Ù? Ù?ذا اÙ?برÙ?اÙ?ج"
+#~ msgid ""
+#~ "This program is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General "
+#~ "Public License for more details.\n"
+#~ msgstr ""
+#~ "Ù?Ù?زÙ?ع Ù?ذا اÙ?برÙ?اÙ?ج عÙ?Ù? Ø£Ù?Ù? Ø£Ù? Ù?Ù?Ù?Ù? Ù?Ù?Ù?دÙ?ا Ù?Ù?Ù? Ù?ستخدÙ?Ù? دÙ?Ù? أدÙ?Ù? Ù?سؤÙ?Ù?Ù?Ø©Ø? Ù?Ù?ا "
+#~ "ØتÙ? Ø£Ù? ضÙ?اÙ? Ù?ضÙ?Ù? صÙ?اØÙ?Ø© اÙ?عرض Ù?Ù? اÙ?سÙ?Ù? Ø£Ù? تÙ?اÙ?Ù?Ù? Ù?ع Ø£Ù? استخداÙ? Ù?Øدد. "
+#~ "Ù?Ù?Ù?Ù?Ù? Ù?راجعة اÙ?رخصة اÙ?عÙ?Ù?Ù?Ù?Ø© اÙ?عاÙ?Ø© Ù?جÙ?Ù? Ù?Ù?زÙ?د Ù?Ù? اÙ?تÙ?اصÙ?Ù?.\n"
-#: ../src/cheese-window.c:1497
-msgid "Countdown"
-msgstr "اÙ?عد اÙ?تÙ?ازÙ?Ù?"
+#~ msgid ""
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with this program. If not, see <http://www.gnu.org/licenses/>."
+#~ msgstr ""
+#~ "Ù?Ù? اÙ?Ù?Ù?ترض Ø£Ù? تÙ?Ù?Ù? Ù?د استÙ?Ù?ت Ù?سخة Ù?Ù? رخصة جÙ?Ù? اÙ?عاÙ?Ø© Ù?ع اÙ?برÙ?اÙ?جØ? Ù?Ù? ØاÙ? "
+#~ "عدÙ? استÙ?اÙ?Ù? Ù?Ø°Ù?Ù?Ø? Ù?Ù?Ù?Ù?Ù? تصÙ?Ø <http://www.gnu.org/licenses/>."
-#: ../src/cheese-window.c:1513
-msgid "_Wide mode"
-msgstr "اÙ?Ù?_ضع اÙ?Ù?اسع"
+#~ msgid "Mauve"
+#~ msgstr "بÙ?Ù?سجÙ?"
-#: ../src/cheese-window.c:1517
-msgid "_Photo"
-msgstr "_صÙ?رة"
+#~ msgid "Noir/Blanc"
+#~ msgstr "أسÙ?د/أبÙ?ض"
-#: ../src/cheese-window.c:1518
-msgid "_Video"
-msgstr "_Ù?Ù?دÙ?Ù?"
+#~ msgid "Hulk"
+#~ msgstr "Ù?Ù?Ù?Ù?"
-#: ../src/cheese-window.c:1519
-msgid "_Burst"
-msgstr "_تÙ?رارÙ?"
+#~ msgid "Vertical Flip"
+#~ msgstr "Ù?Ù?ب رأسÙ?"
-#: ../src/cheese-window.c:1523
-msgid "_Open"
-msgstr "ا_Ù?تØ"
+#~ msgid "Horizontal Flip"
+#~ msgstr "Ù?Ù?ب Ø£Ù?Ù?Ù?"
-#: ../src/cheese-window.c:1525
-msgid "Save _As..."
-msgstr "اØÙ?ظ با_سÙ?..."
+#~ msgid "Shagadelic"
+#~ msgstr "Ù?Ø«Ù?ر"
-#: ../src/cheese-window.c:1527
-msgid "Move to _Trash"
-msgstr "اÙ?Ù?Ù? Ø¥Ù?Ù? اÙ?_Ù?Ù?Ù?Ù?ات"
+#~ msgid "Vertigo"
+#~ msgstr "دÙ?ار"
-#: ../src/cheese-window.c:1529
-msgid "Delete"
-msgstr "اØØ°Ù?"
+#~ msgid "Edge"
+#~ msgstr "ØاÙ?Ø©"
-#: ../src/cheese-window.c:1538
-msgid "_Recording"
-msgstr "اÙ?ت_سجÙ?Ù?"
+#~ msgid "Dice"
+#~ msgstr "Ù?رد"
-#: ../src/cheese-window.c:1542 ../src/cheese-window.c:1587
-msgid "_Take multiple Photos"
-msgstr "اÙ?_تÙ?Ø· عدة صÙ?ر"
+#~ msgid "Warp"
+#~ msgstr "Ø·Ù?"
-#: ../src/cheese-window.c:1546
-msgid "_Set As Account Photo"
-msgstr "ا_جعÙ?Ù?ا صÙ?رة اÙ?Øساب"
+#~ msgid "No camera found!"
+#~ msgstr "Ù?Ù? Ù?جد Ù?Ù?رة!"
-#: ../src/cheese-window.c:1550
-msgid "Send by _Mail"
-msgstr "أرسÙ?Ù? باÙ?_برÙ?د"
+#~ msgid "Please refer to the help for further information."
+#~ msgstr "راجع اÙ?Ù?ساعدة Ù?Ù?زÙ?د Ù?Ù? اÙ?Ù?عÙ?Ù?Ù?ات."
-#: ../src/cheese-window.c:1554
-msgid "Send _To"
-msgstr "أرسÙ? _Ø¥Ù?Ù?"
+#~ msgid "Help on this Application"
+#~ msgstr "Ù?ساعدة ØÙ?Ù? Ù?ذا اÙ?برÙ?اÙ?ج"
-#: ../src/cheese-window.c:1558
-msgid "Export to F-_Spot"
-msgstr "_صدÙ?ر Ø¥Ù?Ù? F-Spot"
+#~ msgid "Countdown"
+#~ msgstr "عد تÙ?ازÙ?Ù?"
-#: ../src/cheese-window.c:1562
-msgid "Export to _Flickr"
-msgstr "صدÙ?ر Ø¥Ù?Ù? _Ù?Ù?Ù?Ù?ر"
+#~ msgid "Flash"
+#~ msgstr "Ù?Ù?Ù?ض"
-#: ../src/cheese-window.c:1600
-msgid "_Start recording"
-msgstr "ا_بدأ اÙ?تسجÙ?Ù?"
+#~ msgid "_Start Recording"
+#~ msgstr "ا_بدأ اÙ?تسجÙ?Ù?"
-#: ../src/cheese-window.c:1758
-msgid "_Take a photo"
-msgstr "ا_Ù?تÙ?Ø· صÙ?رة"
+#~ msgid "Be verbose"
+#~ msgstr "Ù?Ù?Ù? Ù?سÙ?Ù?با"
-#: ../src/cheese-window.c:2018
-msgid "Check your gstreamer installation"
-msgstr "تØÙ?Ù? Ù?Ù? تثبÙ?تÙ? Ù?Ù? gstreamer"
+#~ msgid "Could not set the Account Photo"
+#~ msgstr "تعذÙ?ر Ù?ضع صÙ?رة اÙ?Øساب"
-#: ../src/cheese.c:163
-msgid "Be verbose"
-msgstr "Ù?Ù?Ù? Ù?سÙ?Ù?با"
+#~ msgid "Media files"
+#~ msgstr "Ù?Ù?Ù?ات Ù?سائط"
-#: ../src/cheese.c:165
-msgid "Enable wide mode"
-msgstr "Ù?عÙ?Ù? اÙ?Ù?ضع اÙ?Ù?اسع"
+#~ msgid "_Set As Account Photo"
+#~ msgstr "ا_جعÙ?Ù?ا صÙ?رة اÙ?Øساب"
-#: ../src/cheese.c:169
-msgid "output version information and exit"
-msgstr "اÙ?تب رÙ?Ù? اÙ?إصدار Ø«Ù? اخرج"
+#~ msgid "Send by _Mail"
+#~ msgstr "أرسÙ?Ù? باÙ?_برÙ?د"
-#: ../src/cheese.c:186
-msgid "- Take photos and videos with your webcam, with fun graphical effects"
-msgstr "- اÙ?تÙ?Ø· صÙ?را Ù?Ù?Ù?دÙ?Ù? بÙ?اÙ?Ù?را اÙ?Ù?بØ? Ù?ع تأثÙ?رات رسÙ?Ù?Ù?Ø© Ù?رØØ©"
+#~ msgid "Send _To"
+#~ msgstr "أرسÙ? _Ø¥Ù?Ù?"
+
+#~ msgid "Export to F-_Spot"
+#~ msgstr "_صدÙ?ر Ø¥Ù?Ù? F-Spot"
+
+#~ msgid "Export to _Flickr"
+#~ msgstr "صدÙ?ر Ø¥Ù?Ù? _Ù?Ù?Ù?Ù?ر"
+
+#~ msgid "_Start recording"
+#~ msgstr "ا_بدأ اÙ?تسجÙ?Ù?"
+
+#~ msgid "Check your gstreamer installation"
+#~ msgstr "تØÙ?Ù? Ù?Ù? تثبÙ?تÙ? Ù?Ù? gstreamer"
#~ msgid "<b>Camera</b>"
#~ msgstr "<b>اÙ?Ù?اÙ?رÙ?</b>"
@@ -607,9 +675,3 @@ msgstr "- اÙ?تÙ?Ø· صÙ?را Ù?Ù?Ù?دÙ?Ù? بÙ?اÙ?Ù?را اÙ?Ù?بØ? Ù?ع تأث
#~ msgstr ""
#~ "Ù?Ø´Ù? Ù?ØªØ Ø¨Ø±Ù?اÙ?ج اÙ?برÙ?د Ù?إرساÙ? رساÙ?Ø© Ø¥Ù?Ù?:\n"
#~ "%s"
-
-#~ msgid "Quit"
-#~ msgstr "اخرج"
-
-#~ msgid "About"
-#~ msgstr "عÙ?Ù?"
diff --git a/po/bg.po b/po/bg.po
index 6c22f8d..90c854b 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,36 +1,220 @@
-# Bulgarian translation of Cheese po-file.
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Bulgarian translation of cheese po-file.
+# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
# Copyright (C) 2010 Krasimir Chonov <mk2616 abv bg>.
# This file is distributed under the same license as the cheese package.
-# Alexander Shopov <ash contact bg>, 2008, 2009.
+# Alexander Shopov <ash kambanaria org>, 2008, 2009, 2010.
# Krasimir Chonov <mk2616 abv bg>, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: chese master\n"
+"Project-Id-Version: cheese master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-21 15:32+0200\n"
-"PO-Revision-Date: 2010-01-21 15:32+0200\n"
+"POT-Creation-Date: 2010-08-25 15:44+0300\n"
+"PO-Revision-Date: 2010-08-25 15:43+0300\n"
"Last-Translator: Krasimir Chonov <mk2616 abv bg>\n"
"Language-Team: Bulgarian <dict fsa-bg org>\n"
+"Language: bg\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../data/cheese.desktop.in.in.h:1 ../data/cheese.ui.h:1 ../src/cheese.c:118
+#: ../data/cheese-about.ui.h:1 ../data/cheese.desktop.in.in.h:1
+#: ../src/cheese-main.vala:102
msgid "Cheese"
msgstr "Cheese"
-#: ../data/cheese.desktop.in.in.h:2
-msgid "Cheese Webcam Booth"
-msgstr "Ð?Ñ?ива камеÑ?а Ñ? Cheese"
+#: ../data/cheese-about.ui.h:2
+msgid "Cheese Website"
+msgstr "Уеб Ñ?айÑ? на Cheese"
-#: ../data/cheese.desktop.in.in.h:3 ../src/cheese-window.c:1065
+#: ../data/cheese-about.ui.h:3 ../data/cheese.desktop.in.in.h:3
msgid "Take photos and videos with your webcam, with fun graphical effects"
msgstr ""
"Ð?аÑ?нeмане на Ñ?нимки и клипове Ñ? ваÑ?аÑ?а Ñ?еб камеÑ?а и пÑ?илагане на еÑ?екÑ?и"
+#: ../data/cheese-about.ui.h:4
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see http://www.gnu.org/licenses/\n";
+msgstr ""
+"Тази пÑ?огÑ?ама (Cheese) е Ñ?вободен Ñ?оÑ?Ñ?Ñ?еÑ?. Ð?ожеÑ?е да Ñ? Ñ?азпÑ?оÑ?Ñ?Ñ?анÑ?ваÑ?е и/"
+"или пÑ?оменÑ?Ñ?е под Ñ?Ñ?ловиÑ?Ñ?а на Ð?бÑ?иÑ? пÑ?блиÑ?ен лиÑ?енз на GNU (GNU GPL), какÑ?о "
+"е пÑ?бликÑ?ван оÑ? ФондаÑ?иÑ?Ñ?а за Ñ?вободен Ñ?оÑ?Ñ?Ñ?еÑ? â?? веÑ?Ñ?иÑ? 2 на лиÑ?енза или (по "
+"ваÑ?е Ñ?еÑ?ение) по-кÑ?Ñ?на веÑ?Ñ?иÑ?.\n"
+"Тази пÑ?огÑ?ама Ñ?е Ñ?азпÑ?оÑ?Ñ?Ñ?анÑ?ва Ñ? надеждаÑ?а, Ñ?е Ñ?е бÑ?де полезна, но Ð?Ð?Ð? "
+"Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?Ð Ð?Ð?ЦÐ?Ð?, доÑ?и и коÑ?вениÑ?е за Ð?Ð Ð?Ð?Ð?Ð?Ð?Ð? или СЪÐ?ТÐ?Ð?ТСТÐ?Ð?Ð? С Ð?Ð?Ð?Ð?Ð?ТÐ? Ð? "
+"Ð?Ð? Ð? УÐ?Ð?ТРÐ?Ð?Ð?. Ð?а подÑ?обноÑ?Ñ?и погледнеÑ?е Ð?бÑ?иÑ? пÑ?блиÑ?ен лиÑ?енз на GNU.\n"
+"ТÑ?Ñ?бва да Ñ?Ñ?е полÑ?Ñ?или копие оÑ? Ð?бÑ?иÑ? пÑ?блиÑ?ен лиÑ?енз на GNU (GNU GPL) "
+"заедно Ñ? Ñ?ази пÑ?огÑ?ама. Ð?ко не Ñ?Ñ?е, погледнеÑ?е http://www.gnu.org/licenses/\n";
+
+#: ../data/cheese-about.ui.h:10
+msgid "translator-credits"
+msgstr ""
+"Ð?лекÑ?андÑ?Ñ? Шопов <ash kambanaria org>\n"
+"\n"
+"Ð?Ñ?оекÑ?Ñ?Ñ? за пÑ?евод на GNOME има нÑ?жда оÑ? подкÑ?епа.\n"
+"Ð?аÑ?Ñ?еÑ?е повеÑ?е за наÑ? на http://gnome.cult.bg\n";
+"Ð?окладвайÑ?е за гÑ?еÑ?ки на http://gnome.cult.bg/bugs";
+
+#: ../data/cheese-actions.ui.h:1
+msgid "Burst"
+msgstr "СеÑ?иÑ?"
+
+#: ../data/cheese-actions.ui.h:2
+msgid "Fullscreen"
+msgstr "ЦÑ?л екÑ?ан"
+
+#: ../data/cheese-actions.ui.h:3
+msgid "Help _Contents"
+msgstr "_Ð Ñ?ководÑ?Ñ?во"
+
+#: ../data/cheese-actions.ui.h:4
+msgid "Move All to Trash"
+msgstr "Ð?Ñ?емеÑ?Ñ?ване на вÑ?иÑ?ко в коÑ?Ñ?еÑ?о"
+
+#: ../data/cheese-actions.ui.h:5
+msgid "Move to _Trash"
+msgstr "Ð?Ñ?е_меÑ?Ñ?ване в коÑ?Ñ?еÑ?о"
+
+#: ../data/cheese-actions.ui.h:6
+msgid "Next Effects"
+msgstr "СледваÑ?и еÑ?екÑ?и"
+
+#: ../data/cheese-actions.ui.h:7
+msgid "Previous Effects"
+msgstr "Ð?Ñ?едиÑ?ни еÑ?екÑ?и"
+
+#: ../data/cheese-actions.ui.h:8
+msgid "Save _As"
+msgstr "Ð?апазване _каÑ?о"
+
+#: ../data/cheese-actions.ui.h:9
+msgid "Take _Multiple Photos"
+msgstr "_Снимане на Ñ?еÑ?иÑ? оÑ? Ñ?нимки"
+
+#: ../data/cheese-actions.ui.h:10
+msgid "_About"
+msgstr "_Ð?Ñ?ноÑ?но"
+
+#: ../data/cheese-actions.ui.h:11
+msgid "_Cheese"
+msgstr "_Cheese"
+
+#: ../data/cheese-actions.ui.h:12
+msgid "_Delete"
+msgstr "_Ð?зÑ?Ñ?иване"
+
+#: ../data/cheese-actions.ui.h:13
+msgid "_Edit"
+msgstr "_РедакÑ?иÑ?ане"
+
+#: ../data/cheese-actions.ui.h:14 ../data/cheese-main-window.ui.h:1
+msgid "_Effects"
+msgstr "_Ð?Ñ?екÑ?и"
+
+#: ../data/cheese-actions.ui.h:15
+msgid "_Help"
+msgstr "Ð?омо_Ñ?"
+
+#: ../data/cheese-actions.ui.h:16
+msgid "_Open"
+msgstr "_Ð?Ñ?ваÑ?Ñ?не"
+
+#: ../data/cheese-actions.ui.h:17
+msgid "_Photo"
+msgstr "_Снимка"
+
+#: ../data/cheese-actions.ui.h:18
+msgid "_Preferences"
+msgstr "_Ð?аÑ?Ñ?Ñ?ойки"
+
+#: ../data/cheese-actions.ui.h:19
+msgid "_Quit"
+msgstr "_СпиÑ?ане на пÑ?огÑ?амаÑ?а"
+
+#: ../data/cheese-actions.ui.h:20
+msgid "_Record a Video"
+msgstr "_Ð?апиÑ? на клип"
+
+#: ../data/cheese-actions.ui.h:21 ../data/cheese-main-window.ui.h:3
+msgid "_Take a Photo"
+msgstr "_Снимане на Ñ?нимка"
+
+#: ../data/cheese-actions.ui.h:22
+msgid "_Video"
+msgstr "_Ð?лип"
+
+#: ../data/cheese-actions.ui.h:23
+msgid "_Wide Mode"
+msgstr "_ШиÑ?ок инÑ?еÑ?Ñ?ейÑ?"
+
+#: ../data/cheese-main-window.ui.h:2
+msgid "_Leave Fullscreen"
+msgstr "Ð?зÑ?од оÑ? _Ñ?Ñ?л екÑ?ан"
+
+#: ../data/cheese-prefs.ui.h:1
+msgid "Brightness"
+msgstr "ЯÑ?коÑ?Ñ?"
+
+#: ../data/cheese-prefs.ui.h:2
+msgid "Burst mode"
+msgstr "СеÑ?иÑ? оÑ? Ñ?нимки"
+
+#: ../data/cheese-prefs.ui.h:3
+msgid "Contrast"
+msgstr "Ð?онÑ?Ñ?аÑ?Ñ?"
+
+#: ../data/cheese-prefs.ui.h:4
+msgid "Delay between photos (seconds)"
+msgstr "Ð?нÑ?еÑ?вал междÑ? Ñ?нимкиÑ?е в Ñ?екÑ?нди"
+
+#: ../data/cheese-prefs.ui.h:5
+msgid "Device"
+msgstr "УÑ?Ñ?Ñ?ойÑ?Ñ?во"
+
+#: ../data/cheese-prefs.ui.h:6
+msgid "Hue"
+msgstr "Ð?Ñ?Ñ?енÑ?к"
+
+#: ../data/cheese-prefs.ui.h:7
+msgid "Image properties"
+msgstr "Ð?аÑ?Ñ?Ñ?ойки на изобÑ?ажениеÑ?о"
+
+#: ../data/cheese-prefs.ui.h:8
+msgid "Number of photos"
+msgstr "Ð?Ñ?ой Ñ?нимки"
+
+#: ../data/cheese-prefs.ui.h:9
+msgid "Preferences"
+msgstr "Ð?аÑ?Ñ?Ñ?ойки"
+
+#: ../data/cheese-prefs.ui.h:10
+msgid "Resolution"
+msgstr "РазделиÑ?елна Ñ?поÑ?обноÑ?Ñ?"
+
+#: ../data/cheese-prefs.ui.h:11
+msgid "Saturation"
+msgstr "Ð?аÑ?иÑ?ане"
+
+#: ../data/cheese-prefs.ui.h:12
+msgid "Webcam"
+msgstr "Ð?амеÑ?а"
+
+#: ../data/cheese.desktop.in.in.h:2
+msgid "Cheese Webcam Booth"
+msgstr "Ð?Ñ?ива камеÑ?а Ñ? Cheese"
+
#. Translators: please note, that the effect names are
#. standarized and should not be translated
#: ../data/cheese.schemas.in.h:3
@@ -182,106 +366,46 @@ msgstr "Ð?али да Ñ?е Ñ?Ñ?аÑ?Ñ?иÑ?а Ñ? Ñ?иÑ?ок инÑ?еÑ?Ñ?ейÑ?"
msgid "Width resolution"
msgstr "ХоÑ?изонÑ?ална Ñ?азделиÑ?елна Ñ?поÑ?обноÑ?Ñ?"
-#: ../data/cheese.ui.h:2
-msgid "Switch to Burst Mode"
-msgstr "СеÑ?иÑ? оÑ? Ñ?нимки"
-
-#: ../data/cheese.ui.h:3
-msgid "Switch to Photo Mode"
-msgstr "Ð?диниÑ?на Ñ?нимка"
-
-#: ../data/cheese.ui.h:4
-msgid "Switch to Video Mode"
-msgstr "Ð?идео Ñ?ежим"
-
-#: ../data/cheese.ui.h:5
-msgid "Switch to the Effects Selector"
-msgstr "Ð?збоÑ? на еÑ?екÑ?и"
-
-#: ../data/cheese.ui.h:6 ../src/cheese-window.c:1176
-#: ../src/cheese-window.c:1499
-msgid "_Effects"
-msgstr "_Ð?Ñ?екÑ?и"
-
-#: ../data/cheese.ui.h:7
-msgid "_Leave Fullscreen"
-msgstr "Ð?зÑ?од оÑ? _Ñ?Ñ?л екÑ?ан"
-
-#: ../data/cheese.ui.h:8 ../src/cheese-window.c:1532
-#: ../src/cheese-window.c:1552
-msgid "_Take a Photo"
-msgstr "_Снимане на Ñ?нимка"
-
-#: ../data/cheese-prefs.ui.h:1
-msgid "Brightness"
-msgstr "ЯÑ?коÑ?Ñ?"
-
-#: ../data/cheese-prefs.ui.h:2
-msgid "Burst mode"
-msgstr "СеÑ?иÑ? оÑ? Ñ?нимки"
-
-#: ../data/cheese-prefs.ui.h:3
-msgid "Contrast"
-msgstr "Ð?онÑ?Ñ?аÑ?Ñ?"
-
-#: ../data/cheese-prefs.ui.h:4
-msgid "Delay between photos (seconds)"
-msgstr "Ð?нÑ?еÑ?вал междÑ? Ñ?нимкиÑ?е в Ñ?екÑ?нди"
-
-#: ../data/cheese-prefs.ui.h:5
-msgid "Device"
-msgstr "УÑ?Ñ?Ñ?ойÑ?Ñ?во"
-
-#: ../data/cheese-prefs.ui.h:6
-msgid "Hue"
-msgstr "Ð?Ñ?Ñ?енÑ?к"
-
-#: ../data/cheese-prefs.ui.h:7
-msgid "Image properties"
-msgstr "Ð?аÑ?Ñ?Ñ?ойки на изобÑ?ажениеÑ?о"
-
-#: ../data/cheese-prefs.ui.h:8
-msgid "Number of photos"
-msgstr "Ð?Ñ?ой Ñ?нимки"
-
-#: ../data/cheese-prefs.ui.h:9 ../src/cheese-window.c:1503
-msgid "Preferences"
-msgstr "Ð?аÑ?Ñ?Ñ?ойки"
-
-#: ../data/cheese-prefs.ui.h:10
-msgid "Resolution"
-msgstr "РазделиÑ?елна Ñ?поÑ?обноÑ?Ñ?"
-
-#: ../data/cheese-prefs.ui.h:11 ../src/cheese-effect-chooser.c:66
-msgid "Saturation"
-msgstr "Ð?аÑ?иÑ?ане"
-
-#: ../data/cheese-prefs.ui.h:12
-msgid "Webcam"
-msgstr "Ð?амеÑ?а"
-
-#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:1238
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.vala:594
msgid "Shutter sound"
msgstr "Ð?вÑ?к пÑ?и Ñ?нимка"
-#: ../libcheese/cheese-avatar-chooser.c:222
+#: ../libcheese/cheese-avatar-chooser.c:238
msgid "Take a photo"
msgstr "Снимане"
-#: ../libcheese/cheese-avatar-chooser.c:241 ../src/cheese-window.c:1732
+#: ../libcheese/cheese-avatar-chooser.c:257
msgid "_Take a photo"
msgstr "_Снимка"
-#: ../libcheese/cheese-avatar-chooser.c:256
+#: ../libcheese/cheese-avatar-chooser.c:272
msgid "_Discard photo"
msgstr "Ð?а _не Ñ?е запазва"
-#: ../libcheese/cheese-camera.c:1118
+#: ../libcheese/cheese-camera-device.c:329
+msgid "Device capabilities not supported"
+msgstr "Ð?Ñ?кои вÑ?зможноÑ?Ñ?и на Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?воÑ?о не Ñ?е поддÑ?Ñ?жаÑ?"
+
+#: ../libcheese/cheese-camera-device.c:357
+#, c-format
+msgid "Failed to initialize device %s for capability probing"
+msgstr ""
+"УÑ?Ñ?Ñ?ойÑ?Ñ?воÑ?о â??%sâ?? не може да Ñ?е иниÑ?иализиÑ?а за пÑ?овеÑ?ка на вÑ?зможноÑ?Ñ?иÑ?е мÑ?"
+
+#: ../libcheese/cheese-camera-device.c:515
+msgid "Unknown device"
+msgstr "Ð?епознаÑ?а камеÑ?а"
+
+#: ../libcheese/cheese-camera-device.c:539
+msgid "Cancellable initialization not supported"
+msgstr "Ð?е Ñ?е поддÑ?Ñ?жа иниÑ?иализаÑ?иÑ?, коÑ?Ñ?о може да Ñ?е оÑ?мени"
+
+#: ../libcheese/cheese-camera.c:1156
#, c-format
msgid "No device found"
msgstr "Ð?ипÑ?ва камеÑ?а"
-#: ../libcheese/cheese-camera.c:1137
+#: ../libcheese/cheese-camera.c:1175
msgid "One or more needed GStreamer elements are missing: "
msgstr "Ð?ипÑ?ва поне един елеменÑ? на gstreamer: "
@@ -291,307 +415,47 @@ msgstr "Ð?ипÑ?ва поне един елеменÑ? на gstreamer: "
#. * To enable to show the numbers in your own language, use %Id instead.
#. * Please leave the additional whitespace after the number
#.
-#: ../libcheese/cheese-countdown.c:436 ../libcheese/cheese-countdown.c:455
-#: ../libcheese/cheese-countdown.c:474
+#: ../libcheese/cheese-countdown.c:441 ../libcheese/cheese-countdown.c:460
+#: ../libcheese/cheese-countdown.c:479
#, c-format
msgid "%d "
msgstr "%d "
-#: ../libcheese/cheese-widget.c:289 ../libcheese/cheese-widget.c:391
-msgid "Camera setup failed"
-msgstr "Ð?аÑ?Ñ?Ñ?ойванеÑ?о на камеÑ?аÑ?а е неÑ?Ñ?пеÑ?но"
-
-#: ../libcheese/cheese-camera-device.c:326
-msgid "Device capabilities not supported"
-msgstr "Ð?Ñ?кои вÑ?зможноÑ?Ñ?и на Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?воÑ?о не Ñ?е поддÑ?Ñ?жаÑ?"
-
-#: ../libcheese/cheese-camera-device.c:485
-msgid "Unknown device"
-msgstr "Ð?епознаÑ?а камеÑ?а"
-
-#: ../libcheese/cheese-camera-device.c:509
-msgid "Cancellable initialization not supported"
-msgstr "Ð?е Ñ?е поддÑ?Ñ?жа иниÑ?иализаÑ?иÑ?, коÑ?Ñ?о може да Ñ?е оÑ?мени"
-
-#: ../src/cheese-effect-chooser.c:60
+#: ../src/cheese-effects-manager.vala:116
msgid "No Effect"
msgstr "Ð?ез еÑ?екÑ?"
-#: ../src/cheese-effect-chooser.c:62
-msgid "Mauve"
-msgstr "Ð?ледомоÑ?аво"
-
-#: ../src/cheese-effect-chooser.c:64
-msgid "Noir/Blanc"
-msgstr "ЧеÑ?но-бÑ?ло"
-
-#: ../src/cheese-effect-chooser.c:68
-msgid "Hulk"
-msgstr "Ð?озеленÑ?ване"
-
-#: ../src/cheese-effect-chooser.c:70
-msgid "Vertical Flip"
-msgstr "Ð?бÑ?аÑ?но"
-
-#: ../src/cheese-effect-chooser.c:72
-msgid "Horizontal Flip"
-msgstr "Ð?гледално"
-
-#: ../src/cheese-effect-chooser.c:74
-msgid "Shagadelic"
-msgstr "Хипноза"
-
-#: ../src/cheese-effect-chooser.c:76
-msgid "Vertigo"
-msgstr "Размазано"
-
-#: ../src/cheese-effect-chooser.c:78
-msgid "Edge"
-msgstr "Ð?онÑ?Ñ?Ñ?и"
-
-#: ../src/cheese-effect-chooser.c:80
-msgid "Dice"
-msgstr "Ð?Ñ?бизÑ?м"
-
-#: ../src/cheese-effect-chooser.c:82
-msgid "Warp"
-msgstr "РазкÑ?ивÑ?ване"
-
-#: ../src/cheese-no-camera.c:93
-msgid "No camera found!"
-msgstr "Ð?ипÑ?ва камеÑ?а!"
+#: ../src/cheese-main.vala:37
+msgid "Enable wide mode"
+msgstr "Ð?клÑ?Ñ?ване на Ñ?иÑ?окиÑ? инÑ?еÑ?Ñ?ейÑ?"
-#: ../src/cheese-no-camera.c:94
-msgid "Please refer to the help for further information."
-msgstr "Ð?а повеÑ?е инÑ?оÑ?маÑ?иÑ? пÑ?овеÑ?еÑ?е помоÑ?Ñ?а."
+#: ../src/cheese-main.vala:38
+msgid "Device to use as a camera"
+msgstr "Ð?ое Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?во (камеÑ?а) да Ñ?е използва"
-#: ../src/cheese-window.c:81
-msgid "_Skip"
-msgstr "_Ð?Ñ?опÑ?Ñ?кане"
+#: ../src/cheese-main.vala:38
+msgid "DEVICE"
+msgstr "УСТРÐ?Ð?СТÐ?Ð?"
-#: ../src/cheese-window.c:82
-msgid "S_kip All"
-msgstr "Ð?Ñ?опÑ?Ñ?кане на _вÑ?иÑ?ки"
+#: ../src/cheese-main.vala:39
+msgid "Output version information and exit"
+msgstr "Ð?звеждане на инÑ?оÑ?маÑ?иÑ? за веÑ?Ñ?иÑ?Ñ?а и изÑ?од"
-#: ../src/cheese-window.c:83
-msgid "Delete _All"
-msgstr "_Ð?зÑ?Ñ?иване на вÑ?иÑ?ки"
+#: ../src/cheese-main.vala:66
+msgid "- Take photos and videos from your webcam"
+msgstr "â?? заÑ?немане на Ñ?нимки и клипове Ñ? ваÑ?аÑ?а камеÑ?а"
-#: ../src/cheese-window.c:641
+#: ../src/cheese-main.vala:77
#, c-format
-msgid ""
-"Failed to launch program to show:\n"
-"%s\n"
-"%s"
+msgid "Run '%s --help' to see a full list of available command line options.\n"
msgstr ""
-"Ð?е може да Ñ?е Ñ?Ñ?аÑ?Ñ?иÑ?а пÑ?огÑ?ама, коÑ?Ñ?о да покаже:\n"
-"%s\n"
-"%s"
-
-#: ../src/cheese-window.c:662
-msgid "Save File"
-msgstr "Ð?апазване на Ñ?айл"
-
-#: ../src/cheese-window.c:700
-#, c-format
-msgid "Could not save %s"
-msgstr "â??%sâ?? не може да Ñ?е запази"
-
-#: ../src/cheese-window.c:723
-msgid "Error while deleting"
-msgstr "Ð?Ñ?еÑ?ка пÑ?и изÑ?Ñ?иване"
-
-#: ../src/cheese-window.c:724
-#, c-format
-msgid "The file \"%s\" cannot be deleted. Details: %s"
-msgstr "ФайлÑ?Ñ? â??%sâ?? не може да бÑ?де изÑ?Ñ?иÑ?. Ð?одÑ?обноÑ?Ñ?и: %s"
-
-#: ../src/cheese-window.c:751
-#, c-format
-msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural ""
-"Are you sure you want to permanently delete the %'d selected items?"
-msgstr[0] "СигÑ?Ñ?ни ли Ñ?Ñ?е, Ñ?е иÑ?каÑ?е оконÑ?аÑ?елно да изÑ?Ñ?иеÑ?е %'d избÑ?ан обекÑ??"
-msgstr[1] ""
-"СигÑ?Ñ?ни ли Ñ?Ñ?е, Ñ?е иÑ?каÑ?е оконÑ?аÑ?елно да изÑ?Ñ?иеÑ?е %'d избÑ?ани обекÑ?а?"
-
-#: ../src/cheese-window.c:758
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\"?"
-msgstr "СигÑ?Ñ?ни ли Ñ?Ñ?е, Ñ?е иÑ?каÑ?е оконÑ?аÑ?елно да изÑ?Ñ?иеÑ?е â??%sâ???"
-
-#: ../src/cheese-window.c:761
-#, c-format
-msgid "If you delete an item, it will be permanently lost."
-msgstr "Ð?огаÑ?о изÑ?Ñ?иеÑ?е обекÑ?, Ñ?ой изÑ?езва необÑ?аÑ?имо."
-
-#: ../src/cheese-window.c:782
-msgid "Unknown Error"
-msgstr "Ð?епознаÑ?а гÑ?еÑ?ка"
-
-#: ../src/cheese-window.c:812
-msgid "Cannot move file to trash, do you want to delete immediately?"
-msgstr "ФайлÑ?Ñ? не може да бÑ?де пÑ?емеÑ?Ñ?ен в коÑ?Ñ?еÑ?о. Ð?Ñ?каÑ?е ли да го изÑ?Ñ?иеÑ?е?"
-
-#: ../src/cheese-window.c:813
-#, c-format
-msgid "The file \"%s\" cannot be moved to the trash. Details: %s"
-msgstr "ФайлÑ?Ñ? â??%sâ?? не може да бÑ?де пÑ?емеÑ?Ñ?ен в коÑ?Ñ?еÑ?о: %s"
-
-#: ../src/cheese-window.c:885
-#, c-format
-msgid "Really move all photos and videos to the trash?"
-msgstr "Ð?аиÑ?Ñ?ина ли да Ñ?е пÑ?емеÑ?Ñ?Ñ?Ñ? вÑ?иÑ?ки Ñ?нимки и клипове в коÑ?Ñ?еÑ?о?"
-
-#: ../src/cheese-window.c:893
-msgid "_Move to Trash"
-msgstr "_Ð?Ñ?емеÑ?Ñ?ване в коÑ?Ñ?еÑ?о"
+"Ð?зпÑ?лнеÑ?е â??%s --helpâ??, за да видиÑ?е Ñ?пиÑ?Ñ?к Ñ? налиÑ?ниÑ?е опÑ?ии на командниÑ? "
+"Ñ?ед.\n"
-#: ../src/cheese-window.c:986 ../src/cheese-window.c:1260
-msgid "Unable to open help file for Cheese"
-msgstr "ФайлÑ?Ñ? Ñ? помоÑ?Ñ?а за Cheese не може да бÑ?де оÑ?воÑ?ен"
-
-#: ../src/cheese-window.c:1043
-msgid "translator-credits"
-msgstr ""
-"Ð?лекÑ?андÑ?Ñ? Шопов <ash contact bg>\n"
-"\n"
-"Ð?Ñ?оекÑ?Ñ?Ñ? за пÑ?евод на GNOME има нÑ?жда оÑ? подкÑ?епа.\n"
-"Ð?аÑ?Ñ?еÑ?е повеÑ?е за наÑ? на http://gnome.cult.bg\n";
-"Ð?окладвайÑ?е за гÑ?еÑ?ки на http://gnome.cult.bg/bugs";
-
-#: ../src/cheese-window.c:1046
-msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-msgstr ""
-"Тази пÑ?огÑ?ама (Cheese) е Ñ?вободен Ñ?оÑ?Ñ?Ñ?еÑ?. Ð?ожеÑ?е да Ñ? Ñ?азпÑ?оÑ?Ñ?Ñ?анÑ?ваÑ?е и/"
-"или пÑ?оменÑ?Ñ?е под Ñ?Ñ?ловиÑ?Ñ?а на Ð?бÑ?иÑ? пÑ?блиÑ?ен лиÑ?енз на GNU (GNU GPL), какÑ?о "
-"е пÑ?бликÑ?ван оÑ? ФондаÑ?иÑ?Ñ?а за Ñ?вободен Ñ?оÑ?Ñ?Ñ?еÑ? â?? веÑ?Ñ?иÑ? 2 на лиÑ?енза или (по "
-"ваÑ?е Ñ?еÑ?ение) по-кÑ?Ñ?на веÑ?Ñ?иÑ?.\n"
-
-#: ../src/cheese-window.c:1050
-msgid ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-msgstr ""
-"Тази пÑ?огÑ?ама Ñ?е Ñ?азпÑ?оÑ?Ñ?Ñ?анÑ?ва Ñ? надеждаÑ?а, Ñ?е Ñ?е бÑ?де полезна, но Ð?Ð?Ð? "
-"Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?Ð Ð?Ð?ЦÐ?Ð?, доÑ?и и коÑ?вениÑ?е за Ð?Ð Ð?Ð?Ð?Ð?Ð?Ð? или СЪÐ?ТÐ?Ð?ТСТÐ?Ð?Ð? С Ð?Ð?Ð?Ð?Ð?ТÐ? Ð? "
-"Ð?Ð? Ð? УÐ?Ð?ТРÐ?Ð?Ð?. Ð?а подÑ?обноÑ?Ñ?и погледнеÑ?е Ð?бÑ?иÑ? пÑ?блиÑ?ен лиÑ?енз на GNU.\n"
-
-#: ../src/cheese-window.c:1054
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr ""
-"ТÑ?Ñ?бва да Ñ?Ñ?е полÑ?Ñ?или копие оÑ? Ð?бÑ?иÑ? пÑ?блиÑ?ен лиÑ?енз на GNU (GNU GPL) "
-"заедно Ñ? Ñ?ази пÑ?огÑ?ама. Ð?ко не Ñ?Ñ?е, погледнеÑ?е <http://www.gnu.org/licenses/";
-">."
-
-#: ../src/cheese-window.c:1071
-msgid "Cheese Website"
-msgstr "Уеб Ñ?айÑ? на Cheese"
-
-#: ../src/cheese-window.c:1276
-msgid "_Start Recording"
-msgstr "_Ð?аÑ?ало на запиÑ?"
-
-#: ../src/cheese-window.c:1444
-msgid "_Stop Recording"
+#: ../src/cheese-window.vala:689
+msgid "Stop _Recording"
msgstr "_Ð?Ñ?ай на запиÑ?"
-#: ../src/cheese-window.c:1480
-msgid "_Cheese"
-msgstr "_Cheese"
-
-#: ../src/cheese-window.c:1482
-msgid "_Edit"
-msgstr "_РедакÑ?иÑ?ане"
-
-#: ../src/cheese-window.c:1483
-msgid "Move All to Trash"
-msgstr "Ð?Ñ?емеÑ?Ñ?ване на вÑ?иÑ?ко в коÑ?Ñ?еÑ?о"
-
-#: ../src/cheese-window.c:1486
-msgid "_Help"
-msgstr "Ð?омо_Ñ?"
-
-#: ../src/cheese-window.c:1489
-msgid "_Contents"
-msgstr "_Ð Ñ?ководÑ?Ñ?во"
-
-#: ../src/cheese-window.c:1489
-msgid "Help on this Application"
-msgstr "Ð?омоÑ? за пÑ?огÑ?амаÑ?а"
-
-#: ../src/cheese-window.c:1495
-msgid "Countdown"
-msgstr "Ð?Ñ?оÑ?Ñ?"
-
-#: ../src/cheese-window.c:1511
-msgid "_Wide mode"
-msgstr "_ШиÑ?ок инÑ?еÑ?Ñ?ейÑ?"
-
-#: ../src/cheese-window.c:1515
-msgid "_Photo"
-msgstr "_Снимка"
-
-#: ../src/cheese-window.c:1516
-msgid "_Video"
-msgstr "_Ð?лип"
-
-#: ../src/cheese-window.c:1517
-msgid "_Burst"
-msgstr "_СеÑ?иÑ?"
-
-#: ../src/cheese-window.c:1521
-msgid "_Open"
-msgstr "_Ð?Ñ?ваÑ?Ñ?не"
-
-#: ../src/cheese-window.c:1523
-msgid "Save _Asâ?¦"
-msgstr "Ð?апазване _каÑ?оâ?¦"
-
-#: ../src/cheese-window.c:1525
-msgid "Move to _Trash"
-msgstr "Ð?Ñ?е_меÑ?Ñ?ване в коÑ?Ñ?еÑ?о"
-
-#: ../src/cheese-window.c:1527
-msgid "Delete"
-msgstr "Ð?зÑ?Ñ?иване"
-
-#: ../src/cheese-window.c:1536
-msgid "_Recording"
-msgstr "_Ð?апиÑ?"
-
-#: ../src/cheese-window.c:1540 ../src/cheese-window.c:1565
-msgid "_Take multiple Photos"
-msgstr "_Снимане на Ñ?еÑ?иÑ? оÑ? Ñ?нимки"
-
-#: ../src/cheese-window.c:1578
-msgid "_Start recording"
-msgstr "_Ð?аÑ?ало на запиÑ?"
-
-#: ../src/cheese-window.c:1969
-msgid "Check your GStreamer installation"
-msgstr "Ð?Ñ?овеÑ?еÑ?е инÑ?Ñ?алаÑ?иÑ?Ñ?а на gstreamer"
-
-#: ../src/cheese.c:97
-msgid "Be verbose"
-msgstr "Ð?одÑ?обни Ñ?Ñ?обÑ?ениÑ?"
-
-#: ../src/cheese.c:99
-msgid "Enable wide mode"
-msgstr "Ð?клÑ?Ñ?ване на Ñ?иÑ?окиÑ? инÑ?еÑ?Ñ?ейÑ?"
-
-#: ../src/cheese.c:103
-msgid "output version information and exit"
-msgstr "извеждане на инÑ?оÑ?маÑ?иÑ? за веÑ?Ñ?иÑ?Ñ?а и изÑ?од"
-
-#: ../src/cheese.c:120
-msgid "- Take photos and videos with your webcam, with fun graphical effects"
-msgstr "â?? заÑ?немане на Ñ?нимки и клипове Ñ? ваÑ?аÑ?а камеÑ?а Ñ? веÑ?ели еÑ?екÑ?и"
+#: ../src/cheese-window.vala:821
+msgid "No effects found"
+msgstr "Ð?ипÑ?ваÑ? еÑ?екÑ?и"
diff --git a/po/ca.po b/po/ca.po
index da2afec..4c2a68e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: cheese\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-28 19:30+0100\n"
-"PO-Revision-Date: 2010-02-16 23:15+0100\n"
+"POT-Creation-Date: 2010-09-27 20:29+0200\n"
+"PO-Revision-Date: 2010-09-24 09:50+0200\n"
"Last-Translator: Gil Forcada <gilforcada guifi net>\n"
"Language-Team: Catalan <tradgnome softcatala org>\n"
"MIME-Version: 1.0\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:113
+#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:118
msgid "Cheese"
msgstr "Cheese"
@@ -138,14 +138,18 @@ msgstr ""
"fotos"
#: ../data/cheese.schemas.in.h:23
+msgid "Set to True to use flash when taking a photo"
+msgstr "Establiu-lo a «True» (cert) per utilitzar el flaix quan es facin fotos"
+
+#: ../data/cheese.schemas.in.h:24
msgid "The device which points to the camera (e.g. /dev/video0)"
msgstr "El dispositiu que fa referència a la cà mera (p. e. /dev/video0)"
-#: ../data/cheese.schemas.in.h:24
+#: ../data/cheese.schemas.in.h:25
msgid "The height resolution of the image captured from the camera"
msgstr "La resolució de l'alçada de la foto creada amb la cà mera"
-#: ../data/cheese.schemas.in.h:25
+#: ../data/cheese.schemas.in.h:26
msgid ""
"The length of time, in milliseconds, to delay between taking each photo in a "
"burst sequence of photos."
@@ -153,31 +157,35 @@ msgstr ""
"La durada, en mil·lisegons, entre foto i foto en el mode de seqüència de "
"fotos."
-#: ../data/cheese.schemas.in.h:26
+#: ../data/cheese.schemas.in.h:27
msgid "The number of photos to take in a single burst."
msgstr "El nombre de fotos a fer en una sola seqüència."
-#: ../data/cheese.schemas.in.h:27
+#: ../data/cheese.schemas.in.h:28
msgid "The width resolution of the image captured from the camera"
msgstr "La resolució de l'amplada de la foto creada amb la cà mera"
-#: ../data/cheese.schemas.in.h:28
+#: ../data/cheese.schemas.in.h:29
msgid "Use a countdown"
msgstr "Utilitza un temporitzador"
-#: ../data/cheese.schemas.in.h:29
+#: ../data/cheese.schemas.in.h:30
+msgid "Use a flash"
+msgstr "Utilitza el flaix"
+
+#: ../data/cheese.schemas.in.h:31
msgid "Video Path"
msgstr "Camà del vÃdeo"
-#: ../data/cheese.schemas.in.h:30
+#: ../data/cheese.schemas.in.h:32
msgid "Whether to enable immediate deletion"
msgstr "Si s'ha d'habilitar la supressió immediata"
-#: ../data/cheese.schemas.in.h:31
+#: ../data/cheese.schemas.in.h:33
msgid "Whether to start in wide mode"
msgstr "Si s'ha d'iniciar en mode ampla"
-#: ../data/cheese.schemas.in.h:32
+#: ../data/cheese.schemas.in.h:34
msgid "Width resolution"
msgstr "Resolució de l'amplada"
@@ -197,7 +205,7 @@ msgstr "Canvia al mode vÃdeo"
msgid "Switch to the Effects Selector"
msgstr "Canvia al selector d'efectes"
-#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:57 ../src/cheese-window.c:869
+#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:61 ../src/cheese-window.c:884
msgid "_Effects"
msgstr "E_fectes"
@@ -205,7 +213,7 @@ msgstr "E_fectes"
msgid "_Leave Fullscreen"
msgstr "_Surt de la pantalla completa"
-#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:68 ../src/cheese-window.c:59
+#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:72 ../src/cheese-window.c:59
msgid "_Take a Photo"
msgstr "Fes una f_oto"
@@ -257,7 +265,7 @@ msgstr "Saturació"
msgid "Webcam"
msgstr "CÃ mera web"
-#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:632
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:640
msgid "Shutter sound"
msgstr "So del disparador"
@@ -273,24 +281,24 @@ msgstr "Fes una f_oto"
msgid "_Discard photo"
msgstr "_Descarta la foto"
-#: ../libcheese/cheese-camera-device.c:327
+#: ../libcheese/cheese-camera-device.c:328
msgid "Device capabilities not supported"
msgstr "No estan implementades les especificacions del dispositiu"
-#: ../libcheese/cheese-camera-device.c:488
+#: ../libcheese/cheese-camera-device.c:510
msgid "Unknown device"
msgstr "Dispositiu desconegut"
-#: ../libcheese/cheese-camera-device.c:512
+#: ../libcheese/cheese-camera-device.c:534
msgid "Cancellable initialization not supported"
msgstr "No es pot cancel·lar la inicialització"
-#: ../libcheese/cheese-camera.c:1134
+#: ../libcheese/cheese-camera.c:1139
#, c-format
msgid "No device found"
msgstr "No s'ha trobat cap dispositiu"
-#: ../libcheese/cheese-camera.c:1153
+#: ../libcheese/cheese-camera.c:1158
msgid "One or more needed GStreamer elements are missing: "
msgstr "Manquen un o més elements necessaris del GStreamer: "
@@ -300,8 +308,8 @@ msgstr "Manquen un o més elements necessaris del GStreamer: "
#. * To enable to show the numbers in your own language, use %Id instead.
#. * Please leave the additional whitespace after the number
#.
-#: ../libcheese/cheese-countdown.c:436 ../libcheese/cheese-countdown.c:455
-#: ../libcheese/cheese-countdown.c:474
+#: ../libcheese/cheese-countdown.c:441 ../libcheese/cheese-countdown.c:460
+#: ../libcheese/cheese-countdown.c:479
#, c-format
msgid "%d "
msgstr "%d "
@@ -389,7 +397,7 @@ msgstr "Segur que voleu moure totes les fotos i els vÃdeos a la paperera?"
msgid "_Move to Trash"
msgstr "_Mou a la paperera"
-#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:654
+#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:662
msgid "Unable to open help file for Cheese"
msgstr "No s'ha pogut obrir el fitxer d'ajuda del Cheese"
@@ -482,7 +490,7 @@ msgstr "Distorsió"
msgid "No camera found!"
msgstr "No s'ha trobat cap cà mera"
-#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1219
+#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1258
msgid "Please refer to the help for further information."
msgstr "Per obtenir més informació, consulteu l'ajuda."
@@ -522,35 +530,39 @@ msgstr "_Seqüència"
msgid "Countdown"
msgstr "Temporitzador"
-#: ../src/cheese-ui.h:64
+#: ../src/cheese-ui.h:57
+msgid "Flash"
+msgstr "Flaix"
+
+#: ../src/cheese-ui.h:68
msgid "_Wide mode"
msgstr "Mode _ampla"
-#: ../src/cheese-ui.h:71
+#: ../src/cheese-ui.h:75
msgid "_Recording"
msgstr "E_nregistrament"
-#: ../src/cheese-ui.h:74 ../src/cheese-window.c:62
+#: ../src/cheese-ui.h:78 ../src/cheese-window.c:62
msgid "_Take multiple Photos"
msgstr "Fes _diverses fotos"
-#: ../src/cheese-ui.h:78
+#: ../src/cheese-ui.h:82
msgid "_Open"
msgstr "_Obre"
-#: ../src/cheese-ui.h:80
+#: ../src/cheese-ui.h:84
msgid "Save _Asâ?¦"
msgstr "_Anomena i desaâ?¦"
-#: ../src/cheese-ui.h:82
+#: ../src/cheese-ui.h:86
msgid "Move to _Trash"
msgstr "Moure a la _paperera"
-#: ../src/cheese-ui.h:84
+#: ../src/cheese-ui.h:88
msgid "Delete"
msgstr "Suprimeix"
-#: ../src/cheese-ui.h:89
+#: ../src/cheese-ui.h:93
msgid "Move All to Trash"
msgstr "Mou-ho tot a la paperera"
@@ -562,19 +574,19 @@ msgstr "_Comença l'enregistrament"
msgid "_Stop Recording"
msgstr "Atura l'e_nregistrament"
-#: ../src/cheese.c:96
+#: ../src/cheese.c:97
msgid "Be verbose"
msgstr "Sigues detallat"
-#: ../src/cheese.c:98
+#: ../src/cheese.c:99
msgid "Enable wide mode"
msgstr "Habilita el mode ampla"
-#: ../src/cheese.c:100
+#: ../src/cheese.c:101
msgid "output version information and exit"
msgstr "mostra la informació de la versió i surt"
-#: ../src/cheese.c:115
+#: ../src/cheese.c:120
msgid "- Take photos and videos with your webcam, with fun graphical effects"
msgstr "- Feu fotos i vÃdeos amb la cà mera web, amb efectes grà fics divertits"
diff --git a/po/ca valencia po b/po/ca valencia po
index 539afc6..c787121 100644
--- a/po/ca valencia po
+++ b/po/ca valencia po
@@ -6,10 +6,11 @@ msgid ""
msgstr ""
"Project-Id-Version: cheese\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-23 00:48+0200\n"
-"PO-Revision-Date: 2010-02-16 23:15+0100\n"
+"POT-Creation-Date: 2010-10-23 00:40+0200\n"
+"PO-Revision-Date: 2010-09-24 09:50+0200\n"
"Last-Translator: Gil Forcada <gilforcada guifi net>\n"
"Language-Team: Catalan <tradgnome softcatala org>\n"
+"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -138,14 +139,18 @@ msgstr ""
"fotos"
#: ../data/cheese.schemas.in.h:23
+msgid "Set to True to use flash when taking a photo"
+msgstr "Establiu-lo a «True» (cert) per utilitzar el flaix quan es facen fotos"
+
+#: ../data/cheese.schemas.in.h:24
msgid "The device which points to the camera (e.g. /dev/video0)"
msgstr "El dispositiu que fa referència a la cà mera (p. e. /dev/video0)"
-#: ../data/cheese.schemas.in.h:24
+#: ../data/cheese.schemas.in.h:25
msgid "The height resolution of the image captured from the camera"
msgstr "La resolució de l'alçada de la foto creada amb la cà mera"
-#: ../data/cheese.schemas.in.h:25
+#: ../data/cheese.schemas.in.h:26
msgid ""
"The length of time, in milliseconds, to delay between taking each photo in a "
"burst sequence of photos."
@@ -153,31 +158,35 @@ msgstr ""
"La durada, en mil·lisegons, entre foto i foto en el mode de seqüència de "
"fotos."
-#: ../data/cheese.schemas.in.h:26
+#: ../data/cheese.schemas.in.h:27
msgid "The number of photos to take in a single burst."
msgstr "El nombre de fotos a fer en una sola seqüència."
-#: ../data/cheese.schemas.in.h:27
+#: ../data/cheese.schemas.in.h:28
msgid "The width resolution of the image captured from the camera"
msgstr "La resolució de l'amplada de la foto creada amb la cà mera"
-#: ../data/cheese.schemas.in.h:28
+#: ../data/cheese.schemas.in.h:29
msgid "Use a countdown"
msgstr "Utilitza un temporitzador"
-#: ../data/cheese.schemas.in.h:29
+#: ../data/cheese.schemas.in.h:30
+msgid "Use a flash"
+msgstr "Utilitza el flaix"
+
+#: ../data/cheese.schemas.in.h:31
msgid "Video Path"
msgstr "Camà del vÃdeo"
-#: ../data/cheese.schemas.in.h:30
+#: ../data/cheese.schemas.in.h:32
msgid "Whether to enable immediate deletion"
msgstr "Si s'ha d'habilitar la supressió immediata"
-#: ../data/cheese.schemas.in.h:31
+#: ../data/cheese.schemas.in.h:33
msgid "Whether to start in wide mode"
msgstr "Si s'ha d'iniciar en mode ampla"
-#: ../data/cheese.schemas.in.h:32
+#: ../data/cheese.schemas.in.h:34
msgid "Width resolution"
msgstr "Resolució de l'amplada"
@@ -197,7 +206,7 @@ msgstr "Canvia al mode vÃdeo"
msgid "Switch to the Effects Selector"
msgstr "Canvia al selector d'efectes"
-#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:57 ../src/cheese-window.c:871
+#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:61 ../src/cheese-window.c:884
msgid "_Effects"
msgstr "E_fectes"
@@ -205,7 +214,7 @@ msgstr "E_fectes"
msgid "_Leave Fullscreen"
msgstr "I_x de la pantalla completa"
-#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:68 ../src/cheese-window.c:59
+#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:72 ../src/cheese-window.c:59
msgid "_Take a Photo"
msgstr "Fes una f_oto"
@@ -257,7 +266,7 @@ msgstr "Saturació"
msgid "Webcam"
msgstr "CÃ mera web"
-#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:634
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:640
msgid "Shutter sound"
msgstr "So del disparador"
@@ -273,24 +282,24 @@ msgstr "Fes una f_oto"
msgid "_Discard photo"
msgstr "_Descarta la foto"
-#: ../libcheese/cheese-camera-device.c:327
+#: ../libcheese/cheese-camera-device.c:328
msgid "Device capabilities not supported"
msgstr "No estan implementades les especificacions del dispositiu"
-#: ../libcheese/cheese-camera-device.c:488
+#: ../libcheese/cheese-camera-device.c:510
msgid "Unknown device"
msgstr "Dispositiu desconegut"
-#: ../libcheese/cheese-camera-device.c:512
+#: ../libcheese/cheese-camera-device.c:534
msgid "Cancellable initialization not supported"
msgstr "No es pot cancel·lar la inicialització"
-#: ../libcheese/cheese-camera.c:1137
+#: ../libcheese/cheese-camera.c:1139
#, c-format
msgid "No device found"
msgstr "No s'ha trobat cap dispositiu"
-#: ../libcheese/cheese-camera.c:1156
+#: ../libcheese/cheese-camera.c:1158
msgid "One or more needed GStreamer elements are missing: "
msgstr "Manquen un o més elements necessaris del GStreamer: "
@@ -389,7 +398,7 @@ msgstr "Segur que voleu moure totes les fotos i els vÃdeos a la paperera?"
msgid "_Move to Trash"
msgstr "_Mou a la paperera"
-#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:656
+#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:662
msgid "Unable to open help file for Cheese"
msgstr "No s'ha pogut obrir el fitxer d'ajuda del Cheese"
@@ -482,7 +491,7 @@ msgstr "Distorsió"
msgid "No camera found!"
msgstr "No s'ha trobat cap cà mera"
-#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1222
+#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1258
msgid "Please refer to the help for further information."
msgstr "Per obtindre més informació, consulteu l'ajuda."
@@ -522,35 +531,39 @@ msgstr "_Seqüència"
msgid "Countdown"
msgstr "Temporitzador"
-#: ../src/cheese-ui.h:64
+#: ../src/cheese-ui.h:57
+msgid "Flash"
+msgstr "Flaix"
+
+#: ../src/cheese-ui.h:68
msgid "_Wide mode"
msgstr "Mode _ampla"
-#: ../src/cheese-ui.h:71
+#: ../src/cheese-ui.h:75
msgid "_Recording"
msgstr "E_nregistrament"
-#: ../src/cheese-ui.h:74 ../src/cheese-window.c:62
+#: ../src/cheese-ui.h:78 ../src/cheese-window.c:62
msgid "_Take multiple Photos"
msgstr "Fes _diverses fotos"
-#: ../src/cheese-ui.h:78
+#: ../src/cheese-ui.h:82
msgid "_Open"
msgstr "_Obri"
-#: ../src/cheese-ui.h:80
+#: ../src/cheese-ui.h:84
msgid "Save _Asâ?¦"
msgstr "_Anomena i alça�"
-#: ../src/cheese-ui.h:82
+#: ../src/cheese-ui.h:86
msgid "Move to _Trash"
msgstr "Moure a la _paperera"
-#: ../src/cheese-ui.h:84
+#: ../src/cheese-ui.h:88
msgid "Delete"
msgstr "Suprimeix"
-#: ../src/cheese-ui.h:89
+#: ../src/cheese-ui.h:93
msgid "Move All to Trash"
msgstr "Mou-ho tot a la paperera"
diff --git a/po/cs.po b/po/cs.po
index b22bc3b..3c608f7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,19 +1,22 @@
# Cheese Czech translation.
# Copyright (C) 2007, 2008, 2009, 2010 daniel g. siegel <dgsiegel gnome org> et al.
# This file is distributed under the same license as the cheese package.
+#
# VÃtÄ?zslav Kotrla <vitko post cz>, 2007.
-# Petr Kovar <pknbe volny cz>, 2008, 2010.
# Kamil Páral <ripper42 gmail com>, 2008.
# Lucas Lommer <llommer svn gnome org>, 2009, 2010.
+# Petr Kovar <pknbe volny cz>, 2008, 2010.
+# Marek Ä?ernocký <marek manet cz>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: cheese\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 01:18+0200\n"
-"PO-Revision-Date: 2010-03-26 23:44+0100\n"
-"Last-Translator: Petr Kovar <pknbe volny cz>\n"
+"POT-Creation-Date: 2010-09-27 17:31+0200\n"
+"PO-Revision-Date: 2010-09-27 17:24+0200\n"
+"Last-Translator: Marek Ä?ernocký <marek manet cz>\n"
"Language-Team: Czech <gnome-cs-list gnome org>\n"
+"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -140,14 +143,18 @@ msgid "Set to True to show countdown when taking a photo"
msgstr "PÅ?i povolenà bude pÅ?i poÅ?Ãzenà snÃmku použito odpoÄ?Ãtávánà Ä?asu"
#: ../data/cheese.schemas.in.h:23
+msgid "Set to True to use flash when taking a photo"
+msgstr "Nastavte na Zapnuto, pokud chcete pÅ?i poÅ?izovánà fotek použÃvat blesk"
+
+#: ../data/cheese.schemas.in.h:24
msgid "The device which points to the camera (e.g. /dev/video0)"
msgstr "ZaÅ?ÃzenÃ, které oznaÄ?uje kameru (napÅ?. /dev/video0)"
-#: ../data/cheese.schemas.in.h:24
+#: ../data/cheese.schemas.in.h:25
msgid "The height resolution of the image captured from the camera"
msgstr "Výška rozlišenà obrázku zachyceného kamerou"
-#: ../data/cheese.schemas.in.h:25
+#: ../data/cheese.schemas.in.h:26
msgid ""
"The length of time, in milliseconds, to delay between taking each photo in a "
"burst sequence of photos."
@@ -155,31 +162,35 @@ msgstr ""
"Doba prodlevy v milisekundách mezi jednotlivými snÃmky bÄ?hem jednoho cyklu "
"snÃmánà v sérii."
-#: ../data/cheese.schemas.in.h:26
+#: ../data/cheese.schemas.in.h:27
msgid "The number of photos to take in a single burst."
msgstr "PoÄ?et snÃmků zachycených bÄ?hem jedné série."
-#: ../data/cheese.schemas.in.h:27
+#: ../data/cheese.schemas.in.h:28
msgid "The width resolution of the image captured from the camera"
msgstr "Å ÃÅ?ka rozliÅ¡enà obrázku zachyceného kamerou"
-#: ../data/cheese.schemas.in.h:28
+#: ../data/cheese.schemas.in.h:29
msgid "Use a countdown"
msgstr "PoužÃt odpoÄ?ÃtávánÃ"
-#: ../data/cheese.schemas.in.h:29
+#: ../data/cheese.schemas.in.h:30
+msgid "Use a flash"
+msgstr "PoužÃt blesk"
+
+#: ../data/cheese.schemas.in.h:31
msgid "Video Path"
msgstr "Cesta k videu"
-#: ../data/cheese.schemas.in.h:30
+#: ../data/cheese.schemas.in.h:32
msgid "Whether to enable immediate deletion"
msgstr "Zda povolit okamžité smazánÃ"
-#: ../data/cheese.schemas.in.h:31
+#: ../data/cheese.schemas.in.h:33
msgid "Whether to start in wide mode"
msgstr "Jestli se spouÅ¡tÄ?t v režimu na Å¡ÃÅ?ku"
-#: ../data/cheese.schemas.in.h:32
+#: ../data/cheese.schemas.in.h:34
msgid "Width resolution"
msgstr "Å ÃÅ?ka rozliÅ¡enÃ"
@@ -199,7 +210,7 @@ msgstr "PÅ?epnout do režimu videa"
msgid "Switch to the Effects Selector"
msgstr "PÅ?epnout do výbÄ?ru efektů"
-#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:57 ../src/cheese-window.c:869
+#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:61 ../src/cheese-window.c:884
msgid "_Effects"
msgstr "_Efekty"
@@ -207,7 +218,7 @@ msgstr "_Efekty"
msgid "_Leave Fullscreen"
msgstr "Opustit režim ce_lé obrazovky"
-#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:68 ../src/cheese-window.c:59
+#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:72 ../src/cheese-window.c:59
msgid "_Take a Photo"
msgstr "PoÅ?Ãdi_t snÃmek"
@@ -259,7 +270,7 @@ msgstr "Syté barvy"
msgid "Webcam"
msgstr "Webkamera"
-#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:632
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:640
msgid "Shutter sound"
msgstr "Zvuk záklopky"
@@ -275,24 +286,24 @@ msgstr "PoÅ?Ãdi_t snÃmek"
msgid "_Discard photo"
msgstr "Zaho_dit snÃmek"
-#: ../libcheese/cheese-camera-device.c:327
+#: ../libcheese/cheese-camera-device.c:328
msgid "Device capabilities not supported"
msgstr "Funkce zaÅ?Ãzenà nejsou podporovány"
-#: ../libcheese/cheese-camera-device.c:488
+#: ../libcheese/cheese-camera-device.c:510
msgid "Unknown device"
msgstr "Neznámé zaÅ?ÃzenÃ"
-#: ../libcheese/cheese-camera-device.c:512
+#: ../libcheese/cheese-camera-device.c:534
msgid "Cancellable initialization not supported"
msgstr "ZruÅ¡itelné spouÅ¡tÄ?nà nenà podporováno"
-#: ../libcheese/cheese-camera.c:1134
+#: ../libcheese/cheese-camera.c:1139
#, c-format
msgid "No device found"
msgstr "Žádné zaÅ?Ãzenà nebylo nalezeno"
-#: ../libcheese/cheese-camera.c:1153
+#: ../libcheese/cheese-camera.c:1158
msgid "One or more needed GStreamer elements are missing: "
msgstr "Jeden nebo vÃce potÅ?ebných elementů GStreameru chybÃ: "
@@ -302,8 +313,8 @@ msgstr "Jeden nebo vÃce potÅ?ebných elementů GStreameru chybÃ: "
#. * To enable to show the numbers in your own language, use %Id instead.
#. * Please leave the additional whitespace after the number
#.
-#: ../libcheese/cheese-countdown.c:436 ../libcheese/cheese-countdown.c:455
-#: ../libcheese/cheese-countdown.c:474
+#: ../libcheese/cheese-countdown.c:441 ../libcheese/cheese-countdown.c:460
+#: ../libcheese/cheese-countdown.c:479
#, c-format
msgid "%d "
msgstr "%d "
@@ -390,7 +401,7 @@ msgstr "Opravdu pÅ?esunout vÅ¡echny snÃmky a videoklipy do koÅ¡e?"
msgid "_Move to Trash"
msgstr "_PÅ?esunout do koÅ¡e"
-#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:654
+#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:662
msgid "Unable to open help file for Cheese"
msgstr "Nelze otevÅ?Ãt nápovÄ?du pro Cheese"
@@ -485,7 +496,7 @@ msgstr "Deformace"
msgid "No camera found!"
msgstr "Nenalezena žádná kamera!"
-#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1219
+#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1258
msgid "Please refer to the help for further information."
msgstr "ProsÃm zobrazte si nápovÄ?du, chcete-li dodateÄ?né informace."
@@ -525,35 +536,39 @@ msgstr "_Série"
msgid "Countdown"
msgstr "OdpoÄ?et"
-#: ../src/cheese-ui.h:64
+#: ../src/cheese-ui.h:57
+msgid "Flash"
+msgstr "Blesk"
+
+#: ../src/cheese-ui.h:68
msgid "_Wide mode"
msgstr "_Režim na Å¡ÃÅ?ku"
-#: ../src/cheese-ui.h:71
+#: ../src/cheese-ui.h:75
msgid "_Recording"
msgstr "Nah_rávánÃ"
-#: ../src/cheese-ui.h:74 ../src/cheese-window.c:62
+#: ../src/cheese-ui.h:78 ../src/cheese-window.c:62
msgid "_Take multiple Photos"
msgstr "PoÅ?Ãdi_t vÃcenásobné snÃmky"
-#: ../src/cheese-ui.h:78
+#: ../src/cheese-ui.h:82
msgid "_Open"
msgstr "_OtevÅ?Ãt"
-#: ../src/cheese-ui.h:80
+#: ../src/cheese-ui.h:84
msgid "Save _Asâ?¦"
msgstr "Uložit _jako�"
-#: ../src/cheese-ui.h:82
+#: ../src/cheese-ui.h:86
msgid "Move to _Trash"
msgstr "PÅ?esunou_t do koÅ¡e"
-#: ../src/cheese-ui.h:84
+#: ../src/cheese-ui.h:88
msgid "Delete"
msgstr "Smazat"
-#: ../src/cheese-ui.h:89
+#: ../src/cheese-ui.h:93
msgid "Move All to Trash"
msgstr "PÅ?esunout vÅ¡e do koÅ¡e"
diff --git a/po/da.po b/po/da.po
index ebd9084..9f8b48d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Cheese\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-23 22:58+0100\n"
-"PO-Revision-Date: 2010-03-22 22:39+0100\n"
+"POT-Creation-Date: 2010-09-12 17:04+0200\n"
+"PO-Revision-Date: 2010-09-11 19:42+0200\n"
"Last-Translator: Anders Jenbo <anders jenbo dk>\n"
"Language-Team: Danish <dansk dansk-gruppen dk>\n"
"MIME-Version: 1.0\n"
@@ -23,19 +23,206 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:113
+#: ../data/cheese-about.ui.h:1 ../data/cheese.desktop.in.in.h:1
+#: ../src/cheese-main.vala:102
msgid "Cheese"
msgstr "Cheese"
-#: ../data/cheese.desktop.in.in.h:2
-msgid "Cheese Webcam Booth"
-msgstr "Cheese - webkamerastand"
+#: ../data/cheese-about.ui.h:2
+msgid "Cheese Website"
+msgstr "Webside for Cheese"
-#: ../data/cheese.desktop.in.in.h:3 ../src/cheese-commands-help.c:118
+#: ../data/cheese-about.ui.h:3 ../data/cheese.desktop.in.in.h:3
msgid "Take photos and videos with your webcam, with fun graphical effects"
msgstr ""
"Tag billeder og optag video fra dit webkamera, med sjove grafiske effekter"
+#: ../data/cheese-about.ui.h:4
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see http://www.gnu.org/licenses/\n";
+msgstr ""
+
+#: ../data/cheese-about.ui.h:10
+msgid "translator-credits"
+msgstr ""
+"Anders K. Madsen\n"
+"Kenneth Nielsen\n"
+"\n"
+"Dansk-gruppen <dansk dansk-gruppen dk>\n"
+"Mere info: http://www.dansk-gruppen.dk";
+
+#: ../data/cheese-actions.ui.h:1
+#, fuzzy
+msgid "Burst"
+msgstr "_Serie"
+
+#: ../data/cheese-actions.ui.h:2
+#, fuzzy
+msgid "Fullscreen"
+msgstr "Forlad fuld _skærm"
+
+#: ../data/cheese-actions.ui.h:3
+#, fuzzy
+msgid "Help _Contents"
+msgstr "_Indhold"
+
+#: ../data/cheese-actions.ui.h:4
+msgid "Move All to Trash"
+msgstr "Flyt alle til papirkurv"
+
+#: ../data/cheese-actions.ui.h:5
+msgid "Move to _Trash"
+msgstr "Flyt til _papirkurv"
+
+#: ../data/cheese-actions.ui.h:6
+#, fuzzy
+msgid "Next Effects"
+msgstr "Ingen effekt"
+
+#: ../data/cheese-actions.ui.h:7
+#, fuzzy
+msgid "Previous Effects"
+msgstr "Ingen effekt"
+
+#: ../data/cheese-actions.ui.h:8
+#, fuzzy
+msgid "Save _As"
+msgstr "Gem _somâ?¦"
+
+#: ../data/cheese-actions.ui.h:9
+#, fuzzy
+msgid "Take _Multiple Photos"
+msgstr "_Tag flere billeder"
+
+#: ../data/cheese-actions.ui.h:10
+#, fuzzy
+msgid "_About"
+msgstr "Om"
+
+#: ../data/cheese-actions.ui.h:11
+msgid "_Cheese"
+msgstr "_Cheese"
+
+#: ../data/cheese-actions.ui.h:12
+#, fuzzy
+msgid "_Delete"
+msgstr "Slet"
+
+#: ../data/cheese-actions.ui.h:13
+msgid "_Edit"
+msgstr "_Redigér"
+
+#: ../data/cheese-actions.ui.h:14 ../data/cheese-main-window.ui.h:1
+msgid "_Effects"
+msgstr "_Effekter"
+
+#: ../data/cheese-actions.ui.h:15
+msgid "_Help"
+msgstr "_Hjælp"
+
+#: ../data/cheese-actions.ui.h:16
+msgid "_Open"
+msgstr "_Ã?bn"
+
+#: ../data/cheese-actions.ui.h:17
+msgid "_Photo"
+msgstr "_Billede"
+
+#: ../data/cheese-actions.ui.h:18
+#, fuzzy
+msgid "_Preferences"
+msgstr "Indstillinger"
+
+#: ../data/cheese-actions.ui.h:19
+#, fuzzy
+msgid "_Quit"
+msgstr "Afslut"
+
+#: ../data/cheese-actions.ui.h:20
+#, fuzzy
+msgid "_Record a Video"
+msgstr "_Optager"
+
+#: ../data/cheese-actions.ui.h:21 ../data/cheese-main-window.ui.h:3
+msgid "_Take a Photo"
+msgstr "_Tag et billede"
+
+#: ../data/cheese-actions.ui.h:22
+msgid "_Video"
+msgstr "_Video"
+
+#: ../data/cheese-actions.ui.h:23
+#, fuzzy
+msgid "_Wide Mode"
+msgstr "Bred _tilstand"
+
+#: ../data/cheese-main-window.ui.h:2
+msgid "_Leave Fullscreen"
+msgstr "Forlad fuld _skærm"
+
+#: ../data/cheese-prefs.ui.h:1
+msgid "Brightness"
+msgstr "Lysstyrke"
+
+#: ../data/cheese-prefs.ui.h:2
+msgid "Burst mode"
+msgstr "Serietilstand"
+
+#: ../data/cheese-prefs.ui.h:3
+msgid "Contrast"
+msgstr "Kontrast"
+
+#: ../data/cheese-prefs.ui.h:4
+msgid "Delay between photos (seconds)"
+msgstr "Forsinkelse mellem billeder (sek.)"
+
+#: ../data/cheese-prefs.ui.h:5
+msgid "Device"
+msgstr "Enhed"
+
+#: ../data/cheese-prefs.ui.h:6
+msgid "Hue"
+msgstr "Farvetone"
+
+#: ../data/cheese-prefs.ui.h:7
+msgid "Image properties"
+msgstr "Billedegenskaber"
+
+#: ../data/cheese-prefs.ui.h:8
+msgid "Number of photos"
+msgstr "Antal billeder"
+
+#: ../data/cheese-prefs.ui.h:9
+msgid "Preferences"
+msgstr "Indstillinger"
+
+#: ../data/cheese-prefs.ui.h:10
+msgid "Resolution"
+msgstr "Opløsning"
+
+#: ../data/cheese-prefs.ui.h:11
+msgid "Saturation"
+msgstr "Farvemætning"
+
+#: ../data/cheese-prefs.ui.h:12
+msgid "Webcam"
+msgstr "Webkamera"
+
+#: ../data/cheese.desktop.in.in.h:2
+msgid "Cheese Webcam Booth"
+msgstr "Cheese - webkamerastand"
+
#. Translators: please note, that the effect names are
#. standarized and should not be translated
#: ../data/cheese.schemas.in.h:3
@@ -186,116 +373,45 @@ msgstr "Hvorvidt der startes op i bred tilstand"
msgid "Width resolution"
msgstr "Breddeopløsning"
-#: ../data/cheese.ui.h:1
-msgid "Switch to Burst Mode"
-msgstr "Skift til serietilstand"
-
-#: ../data/cheese.ui.h:2
-msgid "Switch to Photo Mode"
-msgstr "Skift til billedtilstand"
-
-#: ../data/cheese.ui.h:3
-msgid "Switch to Video Mode"
-msgstr "Skift til videotilstand"
-
-#: ../data/cheese.ui.h:4
-msgid "Switch to the Effects Selector"
-msgstr "Skift til effektvælger"
-
-#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:57 ../src/cheese-window.c:869
-msgid "_Effects"
-msgstr "_Effekter"
-
-#: ../data/cheese.ui.h:6
-msgid "_Leave Fullscreen"
-msgstr "Forlad fuld _skærm"
-
-#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:68 ../src/cheese-window.c:59
-msgid "_Take a Photo"
-msgstr "_Tag et billede"
-
-#: ../data/cheese-prefs.ui.h:1
-msgid "Brightness"
-msgstr "Lysstyrke"
-
-#: ../data/cheese-prefs.ui.h:2
-msgid "Burst mode"
-msgstr "Serietilstand"
-
-#: ../data/cheese-prefs.ui.h:3
-msgid "Contrast"
-msgstr "Kontrast"
-
-#: ../data/cheese-prefs.ui.h:4
-msgid "Delay between photos (seconds)"
-msgstr "Forsinkelse mellem billeder (sek.)"
-
-#: ../data/cheese-prefs.ui.h:5
-msgid "Device"
-msgstr "Enhed"
-
-#: ../data/cheese-prefs.ui.h:6
-msgid "Hue"
-msgstr "Farvetone"
-
-#: ../data/cheese-prefs.ui.h:7
-msgid "Image properties"
-msgstr "Billedegenskaber"
-
-#: ../data/cheese-prefs.ui.h:8
-msgid "Number of photos"
-msgstr "Antal billeder"
-
-#: ../data/cheese-prefs.ui.h:9 ../src/cheese-ui.h:44
-msgid "Preferences"
-msgstr "Indstillinger"
-
-#: ../data/cheese-prefs.ui.h:10
-msgid "Resolution"
-msgstr "Opløsning"
-
-#: ../data/cheese-prefs.ui.h:11 ../src/cheese-effect-chooser.c:66
-msgid "Saturation"
-msgstr "Farvemætning"
-
-#: ../data/cheese-prefs.ui.h:12
-msgid "Webcam"
-msgstr "Webkamera"
-
-#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:632
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.vala:594
msgid "Shutter sound"
msgstr "Lukker lyd"
-#: ../libcheese/cheese-avatar-chooser.c:236
+#: ../libcheese/cheese-avatar-chooser.c:238
msgid "Take a photo"
msgstr "Tag et billede"
-#: ../libcheese/cheese-avatar-chooser.c:255
+#: ../libcheese/cheese-avatar-chooser.c:257
msgid "_Take a photo"
msgstr "_Tag et billede"
-#: ../libcheese/cheese-avatar-chooser.c:270
+#: ../libcheese/cheese-avatar-chooser.c:272
msgid "_Discard photo"
msgstr "_Kassér foto"
-#: ../libcheese/cheese-camera-device.c:327
+#: ../libcheese/cheese-camera-device.c:329
msgid "Device capabilities not supported"
msgstr "Enheds funktioner ikke understøttet"
-#: ../libcheese/cheese-camera-device.c:488
+#: ../libcheese/cheese-camera-device.c:357
+#, c-format
+msgid "Failed to initialize device %s for capability probing"
+msgstr ""
+
+#: ../libcheese/cheese-camera-device.c:515
msgid "Unknown device"
msgstr "Ukendt enhed"
-#: ../libcheese/cheese-camera-device.c:512
+#: ../libcheese/cheese-camera-device.c:539
msgid "Cancellable initialization not supported"
msgstr "Annullerbar opstart ikke understøttet"
-#: ../libcheese/cheese-camera.c:1134
+#: ../libcheese/cheese-camera.c:1156
#, c-format
msgid "No device found"
msgstr "Ingen enhed fundet"
-#: ../libcheese/cheese-camera.c:1153
+#: ../libcheese/cheese-camera.c:1175
msgid "One or more needed GStreamer elements are missing: "
msgstr "Et eller flere gstreamer-elementer mangler: "
@@ -305,290 +421,222 @@ msgstr "Et eller flere gstreamer-elementer mangler: "
#. * To enable to show the numbers in your own language, use %Id instead.
#. * Please leave the additional whitespace after the number
#.
-#: ../libcheese/cheese-countdown.c:436 ../libcheese/cheese-countdown.c:455
-#: ../libcheese/cheese-countdown.c:474
+#: ../libcheese/cheese-countdown.c:441 ../libcheese/cheese-countdown.c:460
+#: ../libcheese/cheese-countdown.c:479
#, c-format
msgid "%d "
msgstr "%d "
-#: ../src/cheese-commands-file.c:31
-msgid "_Skip"
-msgstr "_Spring over"
-
-#: ../src/cheese-commands-file.c:32
-msgid "S_kip All"
-msgstr "S_pring alle over"
+#: ../src/cheese-effects-manager.vala:116
+msgid "No Effect"
+msgstr "Ingen effekt"
-#: ../src/cheese-commands-file.c:33
-msgid "Delete _All"
-msgstr "Slet _alle"
+#: ../src/cheese-main.vala:37
+msgid "Enable wide mode"
+msgstr "Slå bred tilstand til"
-#: ../src/cheese-commands-file.c:57
-#, c-format
-msgid ""
-"Failed to launch program to show:\n"
-"%s\n"
-"%s"
+#: ../src/cheese-main.vala:38
+msgid "Device to use as a camera"
msgstr ""
-"Kunne ikke køre program for at fremvise:\n"
-"%s\n"
-"%s"
-#: ../src/cheese-commands-file.c:78
-msgid "Save File"
-msgstr "Gem fil"
-
-#: ../src/cheese-commands-file.c:116
-#, c-format
-msgid "Could not save %s"
-msgstr "Kunne ikke gemme %s"
-
-#: ../src/cheese-commands-file.c:139
-msgid "Error while deleting"
-msgstr "Fejl under sletning"
+#: ../src/cheese-main.vala:38
+msgid "DEVICE"
+msgstr ""
-#: ../src/cheese-commands-file.c:140
-#, c-format
-msgid "The file \"%s\" cannot be deleted. Details: %s"
-msgstr "Filen \"%s\" kan ikke slettes. Detaljer: %s"
+#: ../src/cheese-main.vala:39
+#, fuzzy
+msgid "Output version information and exit"
+msgstr "vis versionsinformation og afslut"
-#: ../src/cheese-commands-file.c:167
-#, c-format
-msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural ""
-"Are you sure you want to permanently delete the %'d selected items?"
-msgstr[0] "Er du sikker på, at du permanent vil slette %'d valgt element?"
-msgstr[1] ""
-"Er du sikker på, at du permanent vil slette de %'d valgte elementer?"
-
-#: ../src/cheese-commands-file.c:174
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\"?"
-msgstr "Er du sikker på, at du permanent vil slette \"%s\"?"
+#: ../src/cheese-main.vala:66
+#, fuzzy
+msgid "- Take photos and videos from your webcam"
+msgstr ""
+"Et \"cheesy\" program til at tage billeder og optage video fra dit webcam"
-#: ../src/cheese-commands-file.c:177
+#: ../src/cheese-main.vala:77
#, c-format
-msgid "If you delete an item, it will be permanently lost."
-msgstr "Hvis du sletter et element, vil det gå permanent tabt."
-
-#: ../src/cheese-commands-file.c:198
-msgid "Unknown Error"
-msgstr "Ukendt fejl"
-
-#: ../src/cheese-commands-file.c:228
-msgid "Cannot move file to trash, do you want to delete immediately?"
+msgid "Run '%s --help' to see a full list of available command line options.\n"
msgstr ""
-"Kan ikke flytte fil til papirkurv, ønsker du at slette den øjeblikkeligt?"
-#: ../src/cheese-commands-file.c:229
-#, c-format
-msgid "The file \"%s\" cannot be moved to the trash. Details: %s"
-msgstr "Filen \"%s\" kan ikke flyttes til papirkurven. Detaljer: %s"
+#: ../src/cheese-window.vala:689
+#, fuzzy
+msgid "Stop _Recording"
+msgstr "_Stop optagelse"
-#: ../src/cheese-commands-file.c:301
-#, c-format
-msgid "Really move all photos and videos to the trash?"
-msgstr "Vil du virkelig flytte alle billeder og videoer til papirkurven?"
+#: ../src/cheese-window.vala:821
+#, fuzzy
+msgid "No effects found"
+msgstr "Ingen enhed fundet"
-#: ../src/cheese-commands-file.c:309
-msgid "_Move to Trash"
-msgstr "_Flyt til papirkurv"
+#~| msgid "Set to True to show countdown when taking a photo"
+#~ msgid "Set to True to use flash when taking a photo"
+#~ msgstr "Sæt til sand, hvis der skal bruges blitz ved fotografering"
-#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:654
-msgid "Unable to open help file for Cheese"
-msgstr "Kunne ikke åbne hjælpfil for Cheese"
+#~ msgid "Use a flash"
+#~ msgstr "Brug blitz"
-#: ../src/cheese-commands-help.c:96
-msgid "translator-credits"
-msgstr ""
-"Anders K. Madsen\n"
-"Kenneth Nielsen\n"
-"\n"
-"Dansk-gruppen <dansk dansk-gruppen dk>\n"
-"Mere info: http://www.dansk-gruppen.dk";
+#~ msgid "Switch to Burst Mode"
+#~ msgstr "Skift til serietilstand"
-#: ../src/cheese-commands-help.c:99
-msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-msgstr ""
-"Dette program er fri software. Du kan redistribuere og/eller modificere det "
-"under de betingelserne som er angivet i GNU General Public License, som er "
-"udgivet af Free Software Foundation. Enten version 2 af licensen eller "
-"(efter eget valg) enhver senere version\n"
+#~ msgid "Switch to Photo Mode"
+#~ msgstr "Skift til billedtilstand"
-#: ../src/cheese-commands-help.c:103
-msgid ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-msgstr ""
-"Dette program distribueres i håb om at det vil vise sig nyttigt, men UDEN "
-"NOGEN FORM FOR GARANTI, uden selv de underforståede garantier omkring "
-"SALGBARHED eller EGNETHED TIL ET BESTEMT FORMÃ?L. Yderligere detaljer kan "
-"læses i GNU General Public License.\n"
+#~ msgid "Switch to Video Mode"
+#~ msgstr "Skift til videotilstand"
-#: ../src/cheese-commands-help.c:107
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr ""
-"Du skulle have modtaget en kopi af GNU General Public License sammen med "
-"dette program. Hvis ikke så kan du finde det her, <http://www.gnu.org/";
-"licenses/>."
+#~ msgid "Switch to the Effects Selector"
+#~ msgstr "Skift til effektvælger"
-#: ../src/cheese-commands-help.c:124
-msgid "Cheese Website"
-msgstr "Webside for Cheese"
+#~ msgid "_Skip"
+#~ msgstr "_Spring over"
-#: ../src/cheese-effect-chooser.c:60
-msgid "No Effect"
-msgstr "Ingen effekt"
+#~ msgid "S_kip All"
+#~ msgstr "S_pring alle over"
-#: ../src/cheese-effect-chooser.c:62
-msgid "Mauve"
-msgstr "Lilla skær"
+#~ msgid "Delete _All"
+#~ msgstr "Slet _alle"
-#: ../src/cheese-effect-chooser.c:64
-msgid "Noir/Blanc"
-msgstr "Sort/Hvid"
+#~ msgid ""
+#~ "Failed to launch program to show:\n"
+#~ "%s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunne ikke køre program for at fremvise:\n"
+#~ "%s\n"
+#~ "%s"
-#: ../src/cheese-effect-chooser.c:68
-msgid "Hulk"
-msgstr "Hulk"
+#~ msgid "Save File"
+#~ msgstr "Gem fil"
-#: ../src/cheese-effect-chooser.c:70
-msgid "Vertical Flip"
-msgstr "PÃ¥ hovedet"
+#~ msgid "Could not save %s"
+#~ msgstr "Kunne ikke gemme %s"
-#: ../src/cheese-effect-chooser.c:72
-msgid "Horizontal Flip"
-msgstr "Spejlvend"
+#~ msgid "Error while deleting"
+#~ msgstr "Fejl under sletning"
-#: ../src/cheese-effect-chooser.c:74
-msgid "Shagadelic"
-msgstr "Shagadelic"
+#~ msgid "The file \"%s\" cannot be deleted. Details: %s"
+#~ msgstr "Filen \"%s\" kan ikke slettes. Detaljer: %s"
-#: ../src/cheese-effect-chooser.c:76
-msgid "Vertigo"
-msgstr "Rundtosset"
+#~ msgid "Are you sure you want to permanently delete the %'d selected item?"
+#~ msgid_plural ""
+#~ "Are you sure you want to permanently delete the %'d selected items?"
+#~ msgstr[0] "Er du sikker på, at du permanent vil slette %'d valgt element?"
+#~ msgstr[1] ""
+#~ "Er du sikker på, at du permanent vil slette de %'d valgte elementer?"
-#: ../src/cheese-effect-chooser.c:78
-msgid "Edge"
-msgstr "Kanter"
+#~ msgid "Are you sure you want to permanently delete \"%s\"?"
+#~ msgstr "Er du sikker på, at du permanent vil slette \"%s\"?"
-#: ../src/cheese-effect-chooser.c:80
-msgid "Dice"
-msgstr "Tern"
+#~ msgid "If you delete an item, it will be permanently lost."
+#~ msgstr "Hvis du sletter et element, vil det gå permanent tabt."
-#: ../src/cheese-effect-chooser.c:82
-msgid "Warp"
-msgstr "Vredet"
+#~ msgid "Unknown Error"
+#~ msgstr "Ukendt fejl"
-#: ../src/cheese-no-camera.c:94
-msgid "No camera found!"
-msgstr "Intet kamera fundet!"
+#~ msgid "Cannot move file to trash, do you want to delete immediately?"
+#~ msgstr ""
+#~ "Kan ikke flytte fil til papirkurv, ønsker du at slette den øjeblikkeligt?"
-# Jeg vil gerne have tilføjet enten "dokumentation" eller "menu" efter hjælp, men efter som jeg reelt ikke ved hvad der menes har jeg ikke gjort det
-#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1219
-msgid "Please refer to the help for further information."
-msgstr "Se hjælp for mere information."
+#~ msgid "The file \"%s\" cannot be moved to the trash. Details: %s"
+#~ msgstr "Filen \"%s\" kan ikke flyttes til papirkurven. Detaljer: %s"
-#: ../src/cheese-ui.h:32
-msgid "_Cheese"
-msgstr "_Cheese"
+#~ msgid "Really move all photos and videos to the trash?"
+#~ msgstr "Vil du virkelig flytte alle billeder og videoer til papirkurven?"
-#: ../src/cheese-ui.h:34
-msgid "_Edit"
-msgstr "_Redigér"
+#~ msgid "_Move to Trash"
+#~ msgstr "_Flyt til papirkurv"
-#: ../src/cheese-ui.h:35
-msgid "_Help"
-msgstr "_Hjælp"
+#~ msgid "Unable to open help file for Cheese"
+#~ msgstr "Kunne ikke åbne hjælpfil for Cheese"
-#: ../src/cheese-ui.h:38
-msgid "_Contents"
-msgstr "_Indhold"
+#~ msgid ""
+#~ "This program is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ msgstr ""
+#~ "Dette program er fri software. Du kan redistribuere og/eller modificere "
+#~ "det under de betingelserne som er angivet i GNU General Public License, "
+#~ "som er udgivet af Free Software Foundation. Enten version 2 af licensen "
+#~ "eller (efter eget valg) enhver senere version\n"
-#: ../src/cheese-ui.h:38
-msgid "Help on this Application"
-msgstr "Hjælp til dette program"
+#~ msgid ""
+#~ "This program is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General "
+#~ "Public License for more details.\n"
+#~ msgstr ""
+#~ "Dette program distribueres i håb om at det vil vise sig nyttigt, men UDEN "
+#~ "NOGEN FORM FOR GARANTI, uden selv de underforståede garantier omkring "
+#~ "SALGBARHED eller EGNETHED TIL ET BESTEMT FORMÃ?L. Yderligere detaljer kan "
+#~ "læses i GNU General Public License.\n"
-#: ../src/cheese-ui.h:48
-msgid "_Photo"
-msgstr "_Billede"
+#~ msgid ""
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with this program. If not, see <http://www.gnu.org/licenses/>."
+#~ msgstr ""
+#~ "Du skulle have modtaget en kopi af GNU General Public License sammen med "
+#~ "dette program. Hvis ikke så kan du finde det her, <http://www.gnu.org/";
+#~ "licenses/>."
-#: ../src/cheese-ui.h:49
-msgid "_Video"
-msgstr "_Video"
+#~ msgid "Mauve"
+#~ msgstr "Lilla skær"
-#: ../src/cheese-ui.h:50
-msgid "_Burst"
-msgstr "_Serie"
+#~ msgid "Noir/Blanc"
+#~ msgstr "Sort/Hvid"
-#: ../src/cheese-ui.h:54
-msgid "Countdown"
-msgstr "Nedtælling"
+#~ msgid "Hulk"
+#~ msgstr "Hulk"
-#: ../src/cheese-ui.h:64
-msgid "_Wide mode"
-msgstr "Bred _tilstand"
+#~ msgid "Vertical Flip"
+#~ msgstr "PÃ¥ hovedet"
-#: ../src/cheese-ui.h:71
-msgid "_Recording"
-msgstr "_Optager"
+#~ msgid "Horizontal Flip"
+#~ msgstr "Spejlvend"
-#: ../src/cheese-ui.h:74 ../src/cheese-window.c:62
-msgid "_Take multiple Photos"
-msgstr "_Tag flere billeder"
+#~ msgid "Shagadelic"
+#~ msgstr "Shagadelic"
-#: ../src/cheese-ui.h:78
-msgid "_Open"
-msgstr "_Ã?bn"
+#~ msgid "Vertigo"
+#~ msgstr "Rundtosset"
-#: ../src/cheese-ui.h:80
-msgid "Save _Asâ?¦"
-msgstr "Gem _somâ?¦"
+#~ msgid "Edge"
+#~ msgstr "Kanter"
-#: ../src/cheese-ui.h:82
-msgid "Move to _Trash"
-msgstr "Flyt til _papirkurv"
+#~ msgid "Dice"
+#~ msgstr "Tern"
-#: ../src/cheese-ui.h:84
-msgid "Delete"
-msgstr "Slet"
+#~ msgid "Warp"
+#~ msgstr "Vredet"
-#: ../src/cheese-ui.h:89
-msgid "Move All to Trash"
-msgstr "Flyt alle til papirkurv"
+#~ msgid "No camera found!"
+#~ msgstr "Intet kamera fundet!"
-#: ../src/cheese-window.c:60
-msgid "_Start Recording"
-msgstr "_Start optagelse"
+# Jeg vil gerne have tilføjet enten "dokumentation" eller "menu" efter hjælp, men efter som jeg reelt ikke ved hvad der menes har jeg ikke gjort det
+#~ msgid "Please refer to the help for further information."
+#~ msgstr "Se hjælp for mere information."
-#: ../src/cheese-window.c:61
-msgid "_Stop Recording"
-msgstr "_Stop optagelse"
+#~ msgid "Help on this Application"
+#~ msgstr "Hjælp til dette program"
-#: ../src/cheese.c:96
-msgid "Be verbose"
-msgstr "Vær uddybende"
+#~ msgid "Countdown"
+#~ msgstr "Nedtælling"
-#: ../src/cheese.c:98
-msgid "Enable wide mode"
-msgstr "Slå bred tilstand til"
+#~ msgid "Flash"
+#~ msgstr "Blitz"
-#: ../src/cheese.c:100
-msgid "output version information and exit"
-msgstr "vis versionsinformation og afslut"
+#~ msgid "_Start Recording"
+#~ msgstr "_Start optagelse"
-#: ../src/cheese.c:115
-msgid "- Take photos and videos with your webcam, with fun graphical effects"
-msgstr ""
-"- Tag billeder og optag video fra dit webkamera, med sjove grafiske effekter"
+#~ msgid "Be verbose"
+#~ msgstr "Vær uddybende"
+
+#~ msgid ""
+#~ "- Take photos and videos with your webcam, with fun graphical effects"
+#~ msgstr ""
+#~ "- Tag billeder og optag video fra dit webkamera, med sjove grafiske "
+#~ "effekter"
#~ msgid "Could not set the Account Photo"
#~ msgstr "Kunne ikke indstille kontobilledet"
@@ -637,31 +685,12 @@ msgstr ""
#~ "Kunne ikke åbne e-postklient for at sende til:\n"
#~ "%s"
-#~ msgid "Quit"
-#~ msgstr "Afslut"
-
-#~ msgid "About"
-#~ msgstr "Om"
-
-#~ msgid "A cheesy program to take photos and videos from your webcam"
-#~ msgstr ""
-#~ "Et \"cheesy\" program til at tage billeder og optage video fra dit webcam"
-
#~ msgid "Cannot move file to trash"
#~ msgstr "Kan ikke flytte fil til papirkurven"
#~ msgid "_Back"
#~ msgstr "Til_bage"
-#, fuzzy
-#~ msgid "A cheesy program to take photos from your webcam"
-#~ msgstr ""
-#~ "Et \"cheesy\" program til at tage billeder og optage video fra dit webcam"
-
-#, fuzzy
-#~ msgid "Cheese Camera"
-#~ msgstr "Cheese"
-
#~ msgid "Could not find the Trash"
#~ msgstr "Kunne ikke finde papirkurven"
diff --git a/po/el.po b/po/el.po
index cc36a3a..003fe0c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,10 +8,10 @@
msgid ""
msgstr ""
"Project-Id-Version: el\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-06 13:30+0200\n"
-"PO-Revision-Date: 2010-03-06 13:34+0200\n"
-"Last-Translator: Kostas Papadimas <pkst gnome org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=cheese&component=general\n";
+"POT-Creation-Date: 2010-08-13 15:31+0000\n"
+"PO-Revision-Date: 2010-08-26 10:47+0200\n"
+"Last-Translator: Michael Kotsarinis <mk73628 hotmail com>\n"
"Language-Team: Greek <team gnome gr>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
"X-Generator: Lokalize 0.2\n"
#: ../data/cheese.desktop.in.in.h:1
-#: ../src/cheese.c:113
+#: ../src/cheese.c:118
msgid "Cheese"
msgstr "Cheese"
@@ -116,42 +116,51 @@ msgid "Set to True to show countdown when taking a photo"
msgstr "Î?αθοÏ?ίÏ?Ï?ε Ï?ο Ï?ε Î?ληθÎÏ? για να Ï?Ï?ηÏ?ιμοÏ?οιείÏ?αι ανÏ?ίÏ?Ï?Ï?οÏ?η μÎÏ?Ï?ηÏ?η καÏ?ά Ï?ην λήÏ?η Ï?Ï?Ï?ογÏ?αÏ?ίαÏ?"
#: ../data/cheese.schemas.in.h:23
+#| msgid "Set to True to show countdown when taking a photo"
+msgid "Set to True to use flash when taking a photo"
+msgstr "Î?αθοÏ?ίÏ?Ï?ε Ï?ο Ï?ε Î?ληθÎÏ? για να Ï?Ï?ήÏ?η Ï?λαÏ? καÏ?ά Ï?ην λήÏ?η Ï?Ï?Ï?ογÏ?αÏ?ίαÏ?"
+
+#: ../data/cheese.schemas.in.h:24
msgid "The device which points to the camera (e.g. /dev/video0)"
msgstr "Î? Ï?Ï?Ï?κεÏ?ή Ï?οÏ? ανÏ?ιÏ?Ï?οιÏ?εί Ï?Ï?η δικÏ?Ï?ακή κάμεÏ?α (Ï?.Ï?. /dev/video0)"
-#: ../data/cheese.schemas.in.h:24
+#: ../data/cheese.schemas.in.h:25
msgid "The height resolution of the image captured from the camera"
msgstr "Το Ï?Ï?οÏ? ανάλÏ?Ï?ηÏ? Ï?ηÏ? εικÏ?ναÏ? Ï?οÏ? καÏ?αγÏ?άÏ?ηκε αÏ?Ï? Ï?ην κάμεÏ?α"
-#: ../data/cheese.schemas.in.h:25
+#: ../data/cheese.schemas.in.h:26
msgid "The length of time, in milliseconds, to delay between taking each photo in a burst sequence of photos."
msgstr "Î? διάÏ?κεια καθÏ?Ï?Ï?εÏ?ηÏ?ηÏ? , Ï?ε εκαÏ?οÏ?Ï?ά δεÏ?Ï?εÏ?ολÎÏ?Ï?οÏ?, ανάμεÏ?α Ï?ε κάθε λήÏ?η Ï?Ï?Ï?ογÏ?αÏ?ίαÏ? Ï?Ï?η λειÏ?οÏ?Ï?γία Ï?ολλαÏ?λήÏ? Ï?Ï?Ï?ογÏ?άÏ?ηÏ?ηÏ?."
-#: ../data/cheese.schemas.in.h:26
+#: ../data/cheese.schemas.in.h:27
msgid "The number of photos to take in a single burst."
msgstr "Î? αÏ?ιθμÏ?Ï? Ï?Ï?ν Ï?Ï?Ï?ογÏ?αÏ?ιÏ?ν Ï?οÏ? θα λαμβάνονÏ?αι Ï?ε κάθε Ï?ολλαÏ?λή Ï?Ï?Ï?ογÏ?άÏ?ηÏ?η."
-#: ../data/cheese.schemas.in.h:27
+#: ../data/cheese.schemas.in.h:28
msgid "The width resolution of the image captured from the camera"
msgstr "Το Ï?λάÏ?οÏ? ανάλÏ?Ï?ηÏ? Ï?ηÏ? εικÏ?ναÏ? Ï?οÏ? καÏ?αγÏ?άÏ?ηκε αÏ?Ï? Ï?ην κάμεÏ?α"
-#: ../data/cheese.schemas.in.h:28
+#: ../data/cheese.schemas.in.h:29
msgid "Use a countdown"
msgstr "ΧÏ?ήÏ?η ανÏ?ίÏ?Ï?Ï?οÏ?ηÏ? μÎÏ?Ï?ηÏ?ηÏ?"
-#: ../data/cheese.schemas.in.h:29
+#: ../data/cheese.schemas.in.h:30
+msgid "Use a flash"
+msgstr "ΧÏ?ήÏ?η Ï?λαÏ?"
+
+#: ../data/cheese.schemas.in.h:31
msgid "Video Path"
msgstr "Î?ιαδÏ?ομή βίνÏ?εο"
-#: ../data/cheese.schemas.in.h:30
+#: ../data/cheese.schemas.in.h:32
msgid "Whether to enable immediate deletion"
msgstr "Î?ν θα ενεÏ?γοÏ?οιηθεί η άμεÏ?η διαγÏ?αÏ?ή"
-#: ../data/cheese.schemas.in.h:31
+#: ../data/cheese.schemas.in.h:33
msgid "Whether to start in wide mode"
msgstr "Î?ν θα γίνεÏ?αι εκκίνηÏ?η Ï?ε λειÏ?οÏ?Ï?γία εÏ?Ï?είαÏ? εικÏ?ναÏ?."
-#: ../data/cheese.schemas.in.h:32
+#: ../data/cheese.schemas.in.h:34
msgid "Width resolution"
msgstr "ΠλάÏ?οÏ? ανάλÏ?Ï?ηÏ?"
@@ -172,8 +181,8 @@ msgid "Switch to the Effects Selector"
msgstr "Î?λλαγή Ï?ε εÏ?ιλογή εÏ?Î"
#: ../data/cheese.ui.h:5
-#: ../src/cheese-ui.h:57
-#: ../src/cheese-window.c:869
+#: ../src/cheese-ui.h:61
+#: ../src/cheese-window.c:884
msgid "_Effects"
msgstr "_Î?Ï?Î"
@@ -182,7 +191,7 @@ msgid "_Leave Fullscreen"
msgstr "Î?_ξοδοÏ? αÏ?Ï? Ï?λήÏ?η οθÏ?νη"
#: ../data/cheese.ui.h:7
-#: ../src/cheese-ui.h:68
+#: ../src/cheese-ui.h:72
#: ../src/cheese-window.c:59
msgid "_Take a Photo"
msgstr "_Î?ήÏ?η Ï?Ï?Ï?ογÏ?αÏ?ίαÏ?"
@@ -238,7 +247,7 @@ msgid "Webcam"
msgstr "Webcam"
#: ../libcheese/cheese-avatar-chooser.c:110
-#: ../src/cheese-window.c:632
+#: ../src/cheese-window.c:640
msgid "Shutter sound"
msgstr "Î?Ï?οÏ? Ï?Ï?Ï?οÏ?Ï?άκÏ?η"
@@ -254,24 +263,24 @@ msgstr "_Î?ήÏ?η Ï?Ï?Ï?ογÏ?αÏ?ίαÏ?"
msgid "_Discard photo"
msgstr "Î?Ï?Ï?_Ï?Ï?ιÏ?η Ï?Ï?Ï?ογÏ?αÏ?ίαÏ?"
-#: ../libcheese/cheese-camera-device.c:327
+#: ../libcheese/cheese-camera-device.c:328
msgid "Device capabilities not supported"
msgstr "Î?εν Ï?Ï?οÏ?Ï?ηÏ?ίζονÏ?αι οι δÏ?ναÏ?Ï?Ï?ηÏ?εÏ? Ï?ηÏ? Ï?Ï?Ï?κεÏ?ήÏ?"
-#: ../libcheese/cheese-camera-device.c:488
+#: ../libcheese/cheese-camera-device.c:510
msgid "Unknown device"
msgstr "Î?γνÏ?Ï?Ï?η Ï?Ï?Ï?κεÏ?ή"
-#: ../libcheese/cheese-camera-device.c:512
+#: ../libcheese/cheese-camera-device.c:534
msgid "Cancellable initialization not supported"
msgstr "Î?εν Ï?Ï?οÏ?Ï?ηÏ?ίζεÏ?αι η ακÏ?Ï?Ï?Ï?η αÏ?Ï?ικοÏ?οίηÏ?ηÏ?"
-#: ../libcheese/cheese-camera.c:1134
+#: ../libcheese/cheese-camera.c:1137
#, c-format
msgid "No device found"
msgstr "Î?ε βÏ?Îθηκε Ï?Ï?Ï?κεÏ?ή"
-#: ../libcheese/cheese-camera.c:1153
+#: ../libcheese/cheese-camera.c:1156
msgid "One or more needed GStreamer elements are missing: "
msgstr "Î?να ή Ï?εÏ?ιÏ?Ï?Ï?Ï?εÏ?α αÏ?αιÏ?οÏ?μενα Ï?Ï?οιÏ?εία Ï?οÏ? gstreamer αγνοοÏ?νÏ?αι: "
@@ -281,9 +290,9 @@ msgstr "Î?να ή Ï?εÏ?ιÏ?Ï?Ï?Ï?εÏ?α αÏ?αιÏ?οÏ?μενα Ï?Ï?οιÏ?εία
#. * To enable to show the numbers in your own language, use %Id instead.
#. * Please leave the additional whitespace after the number
#.
-#: ../libcheese/cheese-countdown.c:436
-#: ../libcheese/cheese-countdown.c:455
-#: ../libcheese/cheese-countdown.c:474
+#: ../libcheese/cheese-countdown.c:441
+#: ../libcheese/cheese-countdown.c:460
+#: ../libcheese/cheese-countdown.c:479
#, c-format
msgid "%d "
msgstr "%d "
@@ -369,7 +378,7 @@ msgid "_Move to Trash"
msgstr "_Î?εÏ?ακίνηÏ?η Ï?Ï?α Î?Ï?οÏ?Ï?ίμμαÏ?α"
#: ../src/cheese-commands-help.c:39
-#: ../src/cheese-window.c:654
+#: ../src/cheese-window.c:662
msgid "Unable to open help file for Cheese"
msgstr "Î?δÏ?ναμία άνοιγμα αÏ?Ï?είοÏ? βοήθειαÏ? για Ï?ο Cheese"
@@ -446,7 +455,7 @@ msgid "No camera found!"
msgstr "Î?ε βÏ?Îθηκε κάμεÏ?α!"
#: ../src/cheese-no-camera.c:95
-#: ../src/cheese-window.c:1219
+#: ../src/cheese-window.c:1258
msgid "Please refer to the help for further information."
msgstr "ΠαÏ?ακαλÏ? αναÏ?Ï?ÎξÏ?ε Ï?Ï?ην βοήθεια για Ï?εÏ?ιÏ?Ï?Ï?Ï?εÏ?εÏ? Ï?ληÏ?οÏ?οÏ?ίεÏ?."
@@ -486,36 +495,40 @@ msgstr "_ΠολλαÏ?λή λήÏ?η"
msgid "Countdown"
msgstr "Î?νÏ?ίÏ?Ï?Ï?οÏ?η μÎÏ?Ï?ηÏ?η"
-#: ../src/cheese-ui.h:64
+#: ../src/cheese-ui.h:57
+msgid "Flash"
+msgstr "ΦλαÏ?"
+
+#: ../src/cheese-ui.h:68
msgid "_Wide mode"
msgstr "_Î?ειÏ?οÏ?Ï?γία εÏ?Ï?είαÏ? εικÏ?ναÏ?"
-#: ../src/cheese-ui.h:71
+#: ../src/cheese-ui.h:75
msgid "_Recording"
msgstr "_Î?γγÏ?αÏ?ή"
-#: ../src/cheese-ui.h:74
+#: ../src/cheese-ui.h:78
#: ../src/cheese-window.c:62
msgid "_Take multiple Photos"
msgstr "_Î?ήÏ?η Ï?ολλαÏ?λÏ?ν Ï?Ï?Ï?ογÏ?αÏ?ιÏ?ν"
-#: ../src/cheese-ui.h:78
+#: ../src/cheese-ui.h:82
msgid "_Open"
msgstr "Î?ν_οιγμα"
-#: ../src/cheese-ui.h:80
+#: ../src/cheese-ui.h:84
msgid "Save _Asâ?¦"
msgstr "_Î?Ï?οθήκεÏ?Ï?η Ï?Ï?..."
-#: ../src/cheese-ui.h:82
+#: ../src/cheese-ui.h:86
msgid "Move to _Trash"
msgstr "Î?εÏ?ακίνηÏ?η Ï?Ï?α αÏ?οÏ?Ï?ίμμα_Ï?α"
-#: ../src/cheese-ui.h:84
+#: ../src/cheese-ui.h:88
msgid "Delete"
msgstr "Î?ιαγÏ?αÏ?ή"
-#: ../src/cheese-ui.h:89
+#: ../src/cheese-ui.h:93
msgid "Move All to Trash"
msgstr "Î?εÏ?ακίνηÏ?η Ï?λÏ?ν Ï?Ï?α αÏ?οÏ?Ï?ίμμαÏ?α"
@@ -527,19 +540,19 @@ msgstr "Î?_ναÏ?ξη εγγÏ?αÏ?ήÏ?"
msgid "_Stop Recording"
msgstr "_Î?ιακοÏ?ή εγγÏ?αÏ?ήÏ?"
-#: ../src/cheese.c:96
+#: ../src/cheese.c:97
msgid "Be verbose"
msgstr "Î?α είÏ?Ï?ε Ï?λÏ?αÏ?οι"
-#: ../src/cheese.c:98
+#: ../src/cheese.c:99
msgid "Enable wide mode"
msgstr "Î?νεÏ?γοÏ?οίηÏ?η εÏ?Ï?είαÏ? εικÏ?ναÏ?"
-#: ../src/cheese.c:100
+#: ../src/cheese.c:101
msgid "output version information and exit"
msgstr "Ï?Ï?οβολή Ï?ληÏ?οÏ?οÏ?ιÏ?ν ÎκδοÏ?ηÏ? και ÎξοδοÏ?"
-#: ../src/cheese.c:115
+#: ../src/cheese.c:120
msgid "- Take photos and videos with your webcam, with fun graphical effects"
msgstr "- Î?ήÏ?η Ï?Ï?Ï?ογÏ?αÏ?ιÏ?ν και βίνÏ?εο αÏ?Ï? Ï?ην δικÏ?Ï?ακή κάμεÏ?ά Ï?αÏ?, με διαÏ?κεδαÏ?Ï?ικά γÏ?αÏ?ικά εÏ?Î"
diff --git a/po/en_GB.po b/po/en_GB.po
index 4dd86bb..dc02157 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,35 +1,218 @@
# English (British) translation.
# Copyright (C) 2008 cheese's COPYRIGHT HOLDER
# This file is distributed under the same licence as the cheese package.
-# Philip Withnall <philip tecnocode co uk>, 2008, 2009.
+# Philip Withnall <philip tecnocode co uk>, 2008, 2009, 2010.
# Bruce Cowan <bcowan fastmail co uk>, 2009, 2010.
msgid ""
msgstr ""
"Project-Id-Version: cheese\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-24 14:55+0000\n"
+"POT-Creation-Date: 2010-08-27 09:52+0100\n"
"PO-Revision-Date: 2010-01-27 20:51+0100\n"
-"Last-Translator: Bruce Cowan <bcowan fastmail co uk>\n"
+"Last-Translator: Philip Withnall <philip tecnocode co uk>\n"
"Language-Team: British English <en li org>\n"
+"Language: en_GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Virtaal 0.5.1\n"
-#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:113
+#: ../data/cheese-about.ui.h:1 ../data/cheese.desktop.in.in.h:1
+#: ../src/cheese-main.vala:102
msgid "Cheese"
msgstr "Cheese"
-#: ../data/cheese.desktop.in.in.h:2
-msgid "Cheese Webcam Booth"
-msgstr "Cheese Webcam Booth"
+#: ../data/cheese-about.ui.h:2
+msgid "Cheese Website"
+msgstr "Cheese Website"
-#: ../data/cheese.desktop.in.in.h:3 ../src/cheese-commands-help.c:118
+#: ../data/cheese-about.ui.h:3 ../data/cheese.desktop.in.in.h:3
msgid "Take photos and videos with your webcam, with fun graphical effects"
msgstr "Take photos and videos with your webcam, with fun graphical effects"
+#: ../data/cheese-about.ui.h:4
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see http://www.gnu.org/licenses/\n";
+msgstr ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public Licence as published by the Free "
+"Software Foundation; either version 2 of the Licence, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public Licence for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public Licence along with "
+"this program. If not, see http://www.gnu.org/licences/\n";
+
+#: ../data/cheese-about.ui.h:10
+msgid "translator-credits"
+msgstr ""
+"Philip Withnall <pwithnall svn gnome org>\n"
+"Bruce Cowan <bcowan fastmail co uk"
+
+#: ../data/cheese-actions.ui.h:1
+msgid "Burst"
+msgstr "Burst"
+
+#: ../data/cheese-actions.ui.h:2
+msgid "Fullscreen"
+msgstr "Fullscreen"
+
+#: ../data/cheese-actions.ui.h:3
+msgid "Help _Contents"
+msgstr "Help _Contents"
+
+#: ../data/cheese-actions.ui.h:4
+msgid "Move All to Trash"
+msgstr "Move All to Wastebasket"
+
+#: ../data/cheese-actions.ui.h:5
+msgid "Move to _Trash"
+msgstr "Move to Was_tebasket"
+
+#: ../data/cheese-actions.ui.h:6
+msgid "Next Effects"
+msgstr "Next Effects"
+
+#: ../data/cheese-actions.ui.h:7
+msgid "Previous Effects"
+msgstr "Previous Effects"
+
+#: ../data/cheese-actions.ui.h:8
+msgid "Save _As"
+msgstr "Save _Asâ?¦"
+
+#: ../data/cheese-actions.ui.h:9
+msgid "Take _Multiple Photos"
+msgstr "Take _Multiple Photos"
+
+#: ../data/cheese-actions.ui.h:10
+msgid "_About"
+msgstr "_About"
+
+#: ../data/cheese-actions.ui.h:11
+msgid "_Cheese"
+msgstr "_Cheese"
+
+#: ../data/cheese-actions.ui.h:12
+msgid "_Delete"
+msgstr "_Delete"
+
+#: ../data/cheese-actions.ui.h:13
+msgid "_Edit"
+msgstr "_Edit"
+
+#: ../data/cheese-actions.ui.h:14 ../data/cheese-main-window.ui.h:1
+msgid "_Effects"
+msgstr "_Effects"
+
+#: ../data/cheese-actions.ui.h:15
+msgid "_Help"
+msgstr "_Help"
+
+#: ../data/cheese-actions.ui.h:16
+msgid "_Open"
+msgstr "_Open"
+
+#: ../data/cheese-actions.ui.h:17
+msgid "_Photo"
+msgstr "_Photo"
+
+#: ../data/cheese-actions.ui.h:18
+msgid "_Preferences"
+msgstr "_Preferences"
+
+#: ../data/cheese-actions.ui.h:19
+msgid "_Quit"
+msgstr "_Quit"
+
+#: ../data/cheese-actions.ui.h:20
+msgid "_Record a Video"
+msgstr "_Record a Video"
+
+#: ../data/cheese-actions.ui.h:21 ../data/cheese-main-window.ui.h:3
+msgid "_Take a Photo"
+msgstr "_Take a Photo"
+
+#: ../data/cheese-actions.ui.h:22
+msgid "_Video"
+msgstr "_Video"
+
+#: ../data/cheese-actions.ui.h:23
+msgid "_Wide Mode"
+msgstr "_Wide Mode"
+
+#: ../data/cheese-main-window.ui.h:2
+msgid "_Leave Fullscreen"
+msgstr "_Leave Fullscreen"
+
+#: ../data/cheese-prefs.ui.h:1
+msgid "Brightness"
+msgstr "Brightness"
+
+#: ../data/cheese-prefs.ui.h:2
+msgid "Burst mode"
+msgstr "Burst mode"
+
+#: ../data/cheese-prefs.ui.h:3
+msgid "Contrast"
+msgstr "Contrast"
+
+#: ../data/cheese-prefs.ui.h:4
+msgid "Delay between photos (seconds)"
+msgstr "Delay between photos (seconds)"
+
+#: ../data/cheese-prefs.ui.h:5
+msgid "Device"
+msgstr "Device"
+
+#: ../data/cheese-prefs.ui.h:6
+msgid "Hue"
+msgstr "Hue"
+
+#: ../data/cheese-prefs.ui.h:7
+msgid "Image properties"
+msgstr "Image properties"
+
+#: ../data/cheese-prefs.ui.h:8
+msgid "Number of photos"
+msgstr "Number of photos"
+
+#: ../data/cheese-prefs.ui.h:9
+msgid "Preferences"
+msgstr "Preferences"
+
+#: ../data/cheese-prefs.ui.h:10
+msgid "Resolution"
+msgstr "Resolution"
+
+#: ../data/cheese-prefs.ui.h:11
+msgid "Saturation"
+msgstr "Saturation"
+
+#: ../data/cheese-prefs.ui.h:12
+msgid "Webcam"
+msgstr "Webcam"
+
+#: ../data/cheese.desktop.in.in.h:2
+msgid "Cheese Webcam Booth"
+msgstr "Cheese Webcam Booth"
+
#. Translators: please note, that the effect names are
#. standarized and should not be translated
#: ../data/cheese.schemas.in.h:3
@@ -180,116 +363,45 @@ msgstr "Whether to start in wide mode"
msgid "Width resolution"
msgstr "Width resolution"
-#: ../data/cheese.ui.h:1
-msgid "Switch to Burst Mode"
-msgstr "Switch to Burst Mode"
-
-#: ../data/cheese.ui.h:2
-msgid "Switch to Photo Mode"
-msgstr "Switch to Photo Mode"
-
-#: ../data/cheese.ui.h:3
-msgid "Switch to Video Mode"
-msgstr "Switch to Video Mode"
-
-#: ../data/cheese.ui.h:4
-msgid "Switch to the Effects Selector"
-msgstr "Switch to the Effects Selector"
-
-#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:57 ../src/cheese-window.c:869
-msgid "_Effects"
-msgstr "_Effects"
-
-#: ../data/cheese.ui.h:6
-msgid "_Leave Fullscreen"
-msgstr "_Leave Fullscreen"
-
-#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:68 ../src/cheese-window.c:59
-msgid "_Take a Photo"
-msgstr "_Take a Photo"
-
-#: ../data/cheese-prefs.ui.h:1
-msgid "Brightness"
-msgstr "Brightness"
-
-#: ../data/cheese-prefs.ui.h:2
-msgid "Burst mode"
-msgstr "Burst mode"
-
-#: ../data/cheese-prefs.ui.h:3
-msgid "Contrast"
-msgstr "Contrast"
-
-#: ../data/cheese-prefs.ui.h:4
-msgid "Delay between photos (seconds)"
-msgstr "Delay between photos (seconds)"
-
-#: ../data/cheese-prefs.ui.h:5
-msgid "Device"
-msgstr "Device"
-
-#: ../data/cheese-prefs.ui.h:6
-msgid "Hue"
-msgstr "Hue"
-
-#: ../data/cheese-prefs.ui.h:7
-msgid "Image properties"
-msgstr "Image properties"
-
-#: ../data/cheese-prefs.ui.h:8
-msgid "Number of photos"
-msgstr "Number of photos"
-
-#: ../data/cheese-prefs.ui.h:9 ../src/cheese-ui.h:44
-msgid "Preferences"
-msgstr "Preferences"
-
-#: ../data/cheese-prefs.ui.h:10
-msgid "Resolution"
-msgstr "Resolution"
-
-#: ../data/cheese-prefs.ui.h:11 ../src/cheese-effect-chooser.c:66
-msgid "Saturation"
-msgstr "Saturation"
-
-#: ../data/cheese-prefs.ui.h:12
-msgid "Webcam"
-msgstr "Webcam"
-
-#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:632
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.vala:594
msgid "Shutter sound"
msgstr "Shutter sound"
-#: ../libcheese/cheese-avatar-chooser.c:236
+#: ../libcheese/cheese-avatar-chooser.c:238
msgid "Take a photo"
msgstr "Take a photo"
-#: ../libcheese/cheese-avatar-chooser.c:255
+#: ../libcheese/cheese-avatar-chooser.c:257
msgid "_Take a photo"
msgstr "_Take a photo"
-#: ../libcheese/cheese-avatar-chooser.c:270
+#: ../libcheese/cheese-avatar-chooser.c:272
msgid "_Discard photo"
msgstr "_Discard photo"
-#: ../libcheese/cheese-camera-device.c:327
+#: ../libcheese/cheese-camera-device.c:329
msgid "Device capabilities not supported"
msgstr "Device capabilities not supported"
-#: ../libcheese/cheese-camera-device.c:488
+#: ../libcheese/cheese-camera-device.c:357
+#, c-format
+msgid "Failed to initialize device %s for capability probing"
+msgstr "Failed to initialise device %s for capability probing"
+
+#: ../libcheese/cheese-camera-device.c:515
msgid "Unknown device"
msgstr "Unknown device"
-#: ../libcheese/cheese-camera-device.c:512
+#: ../libcheese/cheese-camera-device.c:539
msgid "Cancellable initialization not supported"
msgstr "Cancellable initialisation not supported"
-#: ../libcheese/cheese-camera.c:1134
+#: ../libcheese/cheese-camera.c:1156
#, c-format
msgid "No device found"
msgstr "No device found"
-#: ../libcheese/cheese-camera.c:1153
+#: ../libcheese/cheese-camera.c:1175
msgid "One or more needed GStreamer elements are missing: "
msgstr "One or more needed GStreamer elements are missing: "
@@ -299,283 +411,214 @@ msgstr "One or more needed GStreamer elements are missing: "
#. * To enable to show the numbers in your own language, use %Id instead.
#. * Please leave the additional whitespace after the number
#.
-#: ../libcheese/cheese-countdown.c:436 ../libcheese/cheese-countdown.c:455
-#: ../libcheese/cheese-countdown.c:474
+#: ../libcheese/cheese-countdown.c:441 ../libcheese/cheese-countdown.c:460
+#: ../libcheese/cheese-countdown.c:479
#, c-format
msgid "%d "
msgstr "%d "
-#: ../src/cheese-commands-file.c:31
-msgid "_Skip"
-msgstr "_Skip"
-
-#: ../src/cheese-commands-file.c:32
-msgid "S_kip All"
-msgstr "S_kip All"
-
-#: ../src/cheese-commands-file.c:33
-msgid "Delete _All"
-msgstr "Delete _All"
-
-#: ../src/cheese-commands-file.c:57
-#, c-format
-msgid ""
-"Failed to launch program to show:\n"
-"%s\n"
-"%s"
-msgstr ""
-"Failed to launch program to show:\n"
-"%s\n"
-"%s"
-
-#: ../src/cheese-commands-file.c:78
-msgid "Save File"
-msgstr "Save File"
+#: ../src/cheese-effects-manager.vala:116
+msgid "No Effect"
+msgstr "No Effect"
-#: ../src/cheese-commands-file.c:116
-#, c-format
-msgid "Could not save %s"
-msgstr "Could not save %s"
+#: ../src/cheese-main.vala:37
+msgid "Enable wide mode"
+msgstr "Enable wide mode"
-#: ../src/cheese-commands-file.c:139
-msgid "Error while deleting"
-msgstr "Error while deleting"
+#: ../src/cheese-main.vala:38
+msgid "Device to use as a camera"
+msgstr "Device to use as a camera"
-#: ../src/cheese-commands-file.c:140
-#, c-format
-msgid "The file \"%s\" cannot be deleted. Details: %s"
-msgstr "The file \"%s\" cannot be deleted. Details: %s"
+#: ../src/cheese-main.vala:38
+msgid "DEVICE"
+msgstr "DEVICE"
-#: ../src/cheese-commands-file.c:167
-#, c-format
-msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural ""
-"Are you sure you want to permanently delete the %'d selected items?"
-msgstr[0] "Are you sure you want to permanently delete the %'d selected item?"
-msgstr[1] "Are you sure you want to permanently delete the %'d selected items?"
+#: ../src/cheese-main.vala:39
+msgid "Output version information and exit"
+msgstr "Output version information and exit"
-#: ../src/cheese-commands-file.c:174
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\"?"
-msgstr "Are you sure you want to permanently delete \"%s\"?"
+#: ../src/cheese-main.vala:66
+msgid "- Take photos and videos from your webcam"
+msgstr "- Take photos and videos from your webcam"
-#: ../src/cheese-commands-file.c:177
+#: ../src/cheese-main.vala:77
#, c-format
-msgid "If you delete an item, it will be permanently lost."
-msgstr "If you delete an item, it will be permanently lost."
+msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgstr "Run '%s --help' to see a full list of available command line options.\n"
-#: ../src/cheese-commands-file.c:198
-msgid "Unknown Error"
-msgstr "Unknown Error"
-
-#: ../src/cheese-commands-file.c:228
-msgid "Cannot move file to trash, do you want to delete immediately?"
-msgstr ""
-"Cannot move file to the wastebasket, do you want to delete immediately?"
+#: ../src/cheese-window.vala:689
+msgid "Stop _Recording"
+msgstr "Stop _Recording"
-#: ../src/cheese-commands-file.c:229
-#, c-format
-msgid "The file \"%s\" cannot be moved to the trash. Details: %s"
-msgstr "The file \"%s\" cannot be moved to the wastebasket. Details: %s"
+#: ../src/cheese-window.vala:821
+msgid "No effects found"
+msgstr "No effects found"
-#: ../src/cheese-commands-file.c:301
-#, c-format
-msgid "Really move all photos and videos to the trash?"
-msgstr "Really move all photos and videos to the wastebasket?"
+#~ msgid "Set to True to use flash when taking a photo"
+#~ msgstr "Set to True to use flash when taking a photo"
-#: ../src/cheese-commands-file.c:309
-msgid "_Move to Trash"
-msgstr "_Move to Wastebasket"
+#~ msgid "Use a flash"
+#~ msgstr "Use a flash"
-#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:654
-msgid "Unable to open help file for Cheese"
-msgstr "Unable to open help file for Cheese"
+#~ msgid "Switch to Burst Mode"
+#~ msgstr "Switch to Burst Mode"
-#: ../src/cheese-commands-help.c:96
-msgid "translator-credits"
-msgstr ""
-"Philip Withnall <pwithnall svn gnome org>\n"
-"Bruce Cowan <bcowan fastmail co uk"
+#~ msgid "Switch to Photo Mode"
+#~ msgstr "Switch to Photo Mode"
-#: ../src/cheese-commands-help.c:99
-msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-msgstr ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public Licence as published by the Free "
-"Software Foundation; either version 2 of the Licence, or (at your option) "
-"any later version.\n"
+#~ msgid "Switch to Video Mode"
+#~ msgstr "Switch to Video Mode"
-#: ../src/cheese-commands-help.c:103
-msgid ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-msgstr ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public Licence for "
-"more details.\n"
+#~ msgid "Switch to the Effects Selector"
+#~ msgstr "Switch to the Effects Selector"
-#: ../src/cheese-commands-help.c:107
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr ""
-"You should have received a copy of the GNU General Public Licence along with "
-"this program. If not, see <http://www.gnu.org/licences/>."
+#~ msgid "_Skip"
+#~ msgstr "_Skip"
-#: ../src/cheese-commands-help.c:124
-msgid "Cheese Website"
-msgstr "Cheese Website"
+#~ msgid "S_kip All"
+#~ msgstr "S_kip All"
-#: ../src/cheese-effect-chooser.c:60
-msgid "No Effect"
-msgstr "No Effect"
+#~ msgid "Delete _All"
+#~ msgstr "Delete _All"
-#: ../src/cheese-effect-chooser.c:62
-msgid "Mauve"
-msgstr "Mauve"
+#~ msgid ""
+#~ "Failed to launch program to show:\n"
+#~ "%s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Failed to launch program to show:\n"
+#~ "%s\n"
+#~ "%s"
-#: ../src/cheese-effect-chooser.c:64
-msgid "Noir/Blanc"
-msgstr "Noir/Blanc"
+#~ msgid "Save File"
+#~ msgstr "Save File"
-#: ../src/cheese-effect-chooser.c:68
-msgid "Hulk"
-msgstr "Hulk"
+#~ msgid "Could not save %s"
+#~ msgstr "Could not save %s"
-#: ../src/cheese-effect-chooser.c:70
-msgid "Vertical Flip"
-msgstr "Vertical Flip"
+#~ msgid "Error while deleting"
+#~ msgstr "Error while deleting"
-#: ../src/cheese-effect-chooser.c:72
-msgid "Horizontal Flip"
-msgstr "Horizontal Flip"
+#~ msgid "The file \"%s\" cannot be deleted. Details: %s"
+#~ msgstr "The file \"%s\" cannot be deleted. Details: %s"
-#: ../src/cheese-effect-chooser.c:74
-msgid "Shagadelic"
-msgstr "Shagadelic"
+#~ msgid "Are you sure you want to permanently delete the %'d selected item?"
+#~ msgid_plural ""
+#~ "Are you sure you want to permanently delete the %'d selected items?"
+#~ msgstr[0] ""
+#~ "Are you sure you want to permanently delete the %'d selected item?"
+#~ msgstr[1] ""
+#~ "Are you sure you want to permanently delete the %'d selected items?"
-#: ../src/cheese-effect-chooser.c:76
-msgid "Vertigo"
-msgstr "Vertigo"
+#~ msgid "Are you sure you want to permanently delete \"%s\"?"
+#~ msgstr "Are you sure you want to permanently delete \"%s\"?"
-#: ../src/cheese-effect-chooser.c:78
-msgid "Edge"
-msgstr "Edge"
+#~ msgid "If you delete an item, it will be permanently lost."
+#~ msgstr "If you delete an item, it will be permanently lost."
-#: ../src/cheese-effect-chooser.c:80
-msgid "Dice"
-msgstr "Dice"
+#~ msgid "Unknown Error"
+#~ msgstr "Unknown Error"
-#: ../src/cheese-effect-chooser.c:82
-msgid "Warp"
-msgstr "Warp"
+#~ msgid "Cannot move file to trash, do you want to delete immediately?"
+#~ msgstr ""
+#~ "Cannot move file to the wastebasket, do you want to delete immediately?"
-#: ../src/cheese-no-camera.c:94
-msgid "No camera found!"
-msgstr "No camera found!"
+#~ msgid "The file \"%s\" cannot be moved to the trash. Details: %s"
+#~ msgstr "The file \"%s\" cannot be moved to the wastebasket. Details: %s"
-#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1219
-msgid "Please refer to the help for further information."
-msgstr "Please refer to the help for further information."
+#~ msgid "Really move all photos and videos to the trash?"
+#~ msgstr "Really move all photos and videos to the wastebasket?"
-#: ../src/cheese-ui.h:32
-msgid "_Cheese"
-msgstr "_Cheese"
+#~ msgid "_Move to Trash"
+#~ msgstr "_Move to Wastebasket"
-#: ../src/cheese-ui.h:34
-msgid "_Edit"
-msgstr "_Edit"
+#~ msgid "Unable to open help file for Cheese"
+#~ msgstr "Unable to open help file for Cheese"
-#: ../src/cheese-ui.h:35
-msgid "_Help"
-msgstr "_Help"
+#~ msgid ""
+#~ "This program is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ msgstr ""
+#~ "This program is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public Licence as published by the "
+#~ "Free Software Foundation; either version 2 of the Licence, or (at your "
+#~ "option) any later version.\n"
-#: ../src/cheese-ui.h:38
-msgid "_Contents"
-msgstr "_Contents"
+#~ msgid ""
+#~ "This program is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General "
+#~ "Public License for more details.\n"
+#~ msgstr ""
+#~ "This program is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General "
+#~ "Public Licence for more details.\n"
-#: ../src/cheese-ui.h:38
-msgid "Help on this Application"
-msgstr "Help on this Application"
+#~ msgid ""
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with this program. If not, see <http://www.gnu.org/licenses/>."
+#~ msgstr ""
+#~ "You should have received a copy of the GNU General Public Licence along "
+#~ "with this program. If not, see <http://www.gnu.org/licences/>."
-#: ../src/cheese-ui.h:48
-msgid "_Photo"
-msgstr "_Photo"
+#~ msgid "Mauve"
+#~ msgstr "Mauve"
-#: ../src/cheese-ui.h:49
-msgid "_Video"
-msgstr "_Video"
+#~ msgid "Noir/Blanc"
+#~ msgstr "Noir/Blanc"
-#: ../src/cheese-ui.h:50
-msgid "_Burst"
-msgstr "_Burst"
+#~ msgid "Hulk"
+#~ msgstr "Hulk"
-#: ../src/cheese-ui.h:54
-msgid "Countdown"
-msgstr "Countdown"
+#~ msgid "Vertical Flip"
+#~ msgstr "Vertical Flip"
-#: ../src/cheese-ui.h:64
-msgid "_Wide mode"
-msgstr "_Wide mode"
+#~ msgid "Horizontal Flip"
+#~ msgstr "Horizontal Flip"
-#: ../src/cheese-ui.h:71
-msgid "_Recording"
-msgstr "_Recording"
+#~ msgid "Shagadelic"
+#~ msgstr "Shagadelic"
-#: ../src/cheese-ui.h:74 ../src/cheese-window.c:62
-msgid "_Take multiple Photos"
-msgstr "_Take multiple Photos"
+#~ msgid "Vertigo"
+#~ msgstr "Vertigo"
-#: ../src/cheese-ui.h:78
-msgid "_Open"
-msgstr "_Open"
+#~ msgid "Edge"
+#~ msgstr "Edge"
-#: ../src/cheese-ui.h:80
-msgid "Save _Asâ?¦"
-msgstr "Save _Asâ?¦"
+#~ msgid "Dice"
+#~ msgstr "Dice"
-#: ../src/cheese-ui.h:82
-msgid "Move to _Trash"
-msgstr "Move to Was_tebasket"
+#~ msgid "Warp"
+#~ msgstr "Warp"
-#: ../src/cheese-ui.h:84
-msgid "Delete"
-msgstr "Delete"
+#~ msgid "No camera found!"
+#~ msgstr "No camera found!"
-#: ../src/cheese-ui.h:89
-msgid "Move All to Trash"
-msgstr "Move All to Wastebasket"
+#~ msgid "Please refer to the help for further information."
+#~ msgstr "Please refer to the help for further information."
-#: ../src/cheese-window.c:60
-msgid "_Start Recording"
-msgstr "_Start Recording"
+#~ msgid "Help on this Application"
+#~ msgstr "Help on this Application"
-#: ../src/cheese-window.c:61
-msgid "_Stop Recording"
-msgstr "_Stop Recording"
+#~ msgid "Countdown"
+#~ msgstr "Countdown"
-#: ../src/cheese.c:96
-msgid "Be verbose"
-msgstr "Be verbose"
+#~ msgid "Flash"
+#~ msgstr "Flash"
-#: ../src/cheese.c:98
-msgid "Enable wide mode"
-msgstr "Enable wide mode"
+#~ msgid "_Start Recording"
+#~ msgstr "_Start Recording"
-#: ../src/cheese.c:100
-msgid "output version information and exit"
-msgstr "output version information and exit"
+#~ msgid "Be verbose"
+#~ msgstr "Be verbose"
-#: ../src/cheese.c:115
-msgid "- Take photos and videos with your webcam, with fun graphical effects"
-msgstr "- Take photos and videos with your webcam, with fun graphical effects"
+#~ msgid ""
+#~ "- Take photos and videos with your webcam, with fun graphical effects"
+#~ msgstr ""
+#~ "- Take photos and videos with your webcam, with fun graphical effects"
#~ msgid "Camera setup failed"
#~ msgstr "Camera setup failed"
@@ -630,12 +673,6 @@ msgstr "- Take photos and videos with your webcam, with fun graphical effects"
#~ "Failed to open e-mail client to send message to:\n"
#~ "%s"
-#~ msgid "Quit"
-#~ msgstr "Quit"
-
-#~ msgid "About"
-#~ msgstr "About"
-
#~ msgid "The Y resolution of the image captured from the camera"
#~ msgstr "The Y resolution of the image captured from the camera"
@@ -647,6 +684,3 @@ msgstr "- Take photos and videos with your webcam, with fun graphical effects"
#~ msgid "_Back"
#~ msgstr "_Back"
-
-#~ msgid "A cheesy program to take photos and videos from your webcam"
-#~ msgstr "A cheesy program to take photos and videos from your webcam"
diff --git a/po/es.po b/po/es.po
index a3a1820..0d4f66b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,8 +11,8 @@ msgstr ""
"Project-Id-Version: cheese.master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
"product=cheese&component=general\n"
-"POT-Creation-Date: 2010-08-02 22:10+0000\n"
-"PO-Revision-Date: 2010-08-03 07:04+0200\n"
+"POT-Creation-Date: 2010-10-16 10:25+0000\n"
+"PO-Revision-Date: 2010-10-18 12:21+0200\n"
"Last-Translator: Jorge González <jorgegonz svn gnome org>\n"
"Language-Team: Español <gnome-es-list gnome org>\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../data/cheese-about.ui.h:1 ../data/cheese.desktop.in.in.h:1
-#: ../src/cheese-main.vala:105
+#: ../src/cheese-main.vala:102
msgid "Cheese"
msgstr "Cheese"
@@ -36,19 +36,6 @@ msgstr ""
"Tome fotografÃas y vÃdeos con su cámara web, con divertidos efectos gráficos"
#: ../data/cheese-about.ui.h:4
-#| msgid ""
-#| "This program is free software; you can redistribute it and/or modify it "
-#| "under the terms of the GNU General Public License as published by the "
-#| "Free Software Foundation; either version 2 of the License, or (at your "
-#| "option) any later version.\n"
-#| "\n"
-#| "This program is distributed in the hope that it will be useful, but "
-#| "WITHOUT ANY WARRANTY; without even the implied warranty of "
-#| "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General "
-#| "Public License for more details.\n"
-#| "\n"
-#| "You should have received a copy of the GNU General Public License along "
-#| "with this program. If not, see <http://www.gnu.org/licenses/>.\n"
msgid ""
"This program is free software; you can redistribute it and/or modify it "
"under the terms of the GNU General Public License as published by the Free "
@@ -325,7 +312,7 @@ msgstr "Contraste de la imagen"
#: ../data/cheese.schemas.in.h:19
msgid "Picture hue"
-msgstr "Todo de la imagen"
+msgstr "Tono de la imagen"
#: ../data/cheese.schemas.in.h:20
msgid "Picture saturation"
@@ -383,45 +370,45 @@ msgstr "Indica si se debe iniciar en modo ancho"
msgid "Width resolution"
msgstr "Resolución de la anchura"
-#: ../libcheese/cheese-avatar-chooser.c:110
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.vala:594
msgid "Shutter sound"
msgstr "Sonido del obturador"
-#: ../libcheese/cheese-avatar-chooser.c:236
+#: ../libcheese/cheese-avatar-chooser.c:238
msgid "Take a photo"
msgstr "Tomar una foto"
-#: ../libcheese/cheese-avatar-chooser.c:255
+#: ../libcheese/cheese-avatar-chooser.c:257
msgid "_Take a photo"
msgstr "_Tomar una foto"
-#: ../libcheese/cheese-avatar-chooser.c:270
+#: ../libcheese/cheese-avatar-chooser.c:272
msgid "_Discard photo"
msgstr "_Descartar foto"
-#: ../libcheese/cheese-camera-device.c:328
+#: ../libcheese/cheese-camera-device.c:329
msgid "Device capabilities not supported"
msgstr "No se soportan las capacidades del dispositivo"
-#: ../libcheese/cheese-camera-device.c:352
+#: ../libcheese/cheese-camera-device.c:357
#, c-format
msgid "Failed to initialize device %s for capability probing"
msgstr "Falló al inicializar el dispositivo %s para probar sus capacidades"
-#: ../libcheese/cheese-camera-device.c:510
+#: ../libcheese/cheese-camera-device.c:515
msgid "Unknown device"
msgstr "Dispositivo desconocido"
-#: ../libcheese/cheese-camera-device.c:534
+#: ../libcheese/cheese-camera-device.c:539
msgid "Cancellable initialization not supported"
msgstr "No se soporta la inicialización cancelable"
-#: ../libcheese/cheese-camera.c:1128
+#: ../libcheese/cheese-camera.c:1156
#, c-format
msgid "No device found"
msgstr "No se encontró ningún dispositivo"
-#: ../libcheese/cheese-camera.c:1147
+#: ../libcheese/cheese-camera.c:1175
msgid "One or more needed GStreamer elements are missing: "
msgstr "Faltan uno o más elementos necesarios de GStreamer: "
@@ -437,38 +424,48 @@ msgstr "Faltan uno o más elementos necesarios de GStreamer: "
msgid "%d "
msgstr "%Id "
-#: ../src/cheese-main.vala:38
-msgid "Be verbose"
-msgstr "Proporcionar detalles"
+#: ../src/cheese-effects-manager.vala:116
+msgid "No Effect"
+msgstr "Sin efectos"
-#: ../src/cheese-main.vala:39
+#: ../src/cheese-main.vala:37
msgid "Enable wide mode"
msgstr "Activar el modo ancho"
-#: ../src/cheese-main.vala:40
+#: ../src/cheese-main.vala:38
+msgid "Device to use as a camera"
+msgstr "Dispositivo que usar como cámara"
+
+#: ../src/cheese-main.vala:38
+msgid "DEVICE"
+msgstr "DISPOSITIVO"
+
+#: ../src/cheese-main.vala:39
msgid "Output version information and exit"
msgstr "Mostrar información de la versión y salir"
-#: ../src/cheese-main.vala:75
+#: ../src/cheese-main.vala:66
msgid "- Take photos and videos from your webcam"
msgstr ": Tomar fotografÃas y vÃdeos con su cámara web"
-#: ../src/cheese-main.vala:86
+#: ../src/cheese-main.vala:77
#, c-format
msgid "Run '%s --help' to see a full list of available command line options.\n"
msgstr ""
"Ejecutar «%s --help» para ver una lista completa de opciones de liÌ?nea de "
"comandos disponibles.\n"
-#: ../src/cheese-window.vala:604
+#: ../src/cheese-window.vala:689
msgid "Stop _Recording"
msgstr "_Detener grabacioÌ?n"
-#: ../src/cheese-window.vala:723
-#| msgid "No device found"
+#: ../src/cheese-window.vala:821
msgid "No effects found"
msgstr "No se encontró ningún efecto"
+#~ msgid "Be verbose"
+#~ msgstr "Proporcionar detalles"
+
#~ msgid "Historical"
#~ msgstr "Histórico"
@@ -481,9 +478,6 @@ msgstr "No se encontró ningún efecto"
#~ msgid "Hulk"
#~ msgstr "Hulk"
-#~ msgid "No Effect"
-#~ msgstr "Sin efectos"
-
#~ msgid "Mauve"
#~ msgstr "Malva"
diff --git a/po/et.po b/po/et.po
index 7025256..4117de5 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,17 +5,18 @@
# This file is distributed under the same license as the Cheese package.
#
# Ivar Smolin <okul linux ee>, 2008-2010.
-# Mattias Põldaru <mahfiaz gmail com>, 2008, 2009.
+# Mattias Põldaru <mahfiaz gmail com>, 2008-2010.
#
msgid ""
msgstr ""
"Project-Id-Version: cheese MASTER\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
"product=cheese&component=general\n"
-"POT-Creation-Date: 2010-07-30 09:37+0000\n"
-"PO-Revision-Date: 2010-07-31 22:18+0300\n"
-"Last-Translator: Ivar Smolin <okul linux ee>\n"
+"POT-Creation-Date: 2010-10-04 01:55+0000\n"
+"PO-Revision-Date: 2010-10-06 17:12+0300\n"
+"Last-Translator: Mattias Põldaru <mahfiaz gmail com>\n"
"Language-Team: Estonian <gnome-et linux ee>\n"
+"Language: et\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -43,20 +44,20 @@ msgid ""
"more details.\n"
"\n"
"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>.\n"
+"this program. If not, see http://www.gnu.org/licenses/\n";
msgstr ""
-"See programm on vaba tarkvara. Te võite seda edasi levitada ja/või muuta "
+"See rakendus on vaba tarkvara. Sa võid seda edasi levitada ja/või muuta "
"vastavalt GNU Ã?ldise Avaliku Litsentsi tingimustele, nagu need on Vaba "
"Tarkvara Fondi poolt avaldatud; kas Litsentsi versioon number 2 või "
-"(vastavalt Teie valikule) ükskõik milline hilisem versioon.\n"
+"(vastavalt sinu valikule) ükskõik milline hilisem versioon.\n"
"\n"
-"Seda programmi levitatakse lootuses, et see on kasulik, kuid ILMA "
-"IGASUGUSE GARANTIITA; isegi KESKMISE/TAVALISE KVALITEEDIGARANTIITA või "
-"SOBIVUSELE TEATUD KINDLAKS EESMÃ?RGIKS. Ã?ksikasjade suhtes vaata GNU "
-"Ã?ldist Avalikku Litsentsi.\n"
+"Seda rakendust levitatakse lootuses, et see on kasulik, kuid ILMA IGASUGUSE "
+"GARANTIITA; isegi KESKMISE/TAVALISE KVALITEEDIGARANTIITA või SOBIVUSELE "
+"TEATUD KINDLAKS EESMÃ?RGIKS. Ã?ksikasjade suhtes vaadake GNU Ã?ldist Avalikku "
+"Litsentsi.\n"
"\n"
-"Te peaks olema saanud GNU Ã?ldise Avaliku Litsentsi koopia koos selle "
-"programmiga; kui ei, siis vaadake aadressi <http://www.gnu.org/licenses/>.\n"
+"Sa peaks olema saanud GNU Ã?ldise Avaliku Litsentsi koopia koos selle "
+"rakendusega; kui mitte, siis vaata http://www.gnu.org/licenses/\n";
msgid "translator-credits"
msgstr ""
@@ -64,13 +65,13 @@ msgstr ""
"Mattias Põldaru <mahfiaz gmail com>, 2008, 2009."
msgid "Burst"
-msgstr "Fotoseeria"
+msgstr "Sarivõte"
msgid "Fullscreen"
msgstr "Täisekraan"
msgid "Help _Contents"
-msgstr "Abiteabe _sisukord"
+msgstr "Abi _sisukord"
msgid "Move All to Trash"
msgstr "Viska kõik prügikasti"
@@ -88,10 +89,10 @@ msgid "Save _As"
msgstr "Salvesta _kui"
msgid "Take _Multiple Photos"
-msgstr "Tee _mitu fotot"
+msgstr "_Tee mitu fotot"
msgid "_About"
-msgstr "_Programmist lähemalt"
+msgstr "_Programmist"
msgid "_Cheese"
msgstr "_Cheese"
@@ -139,7 +140,7 @@ msgid "Brightness"
msgstr "Heledus"
msgid "Burst mode"
-msgstr "Seeriarežiim"
+msgstr "Sarivõte"
msgid "Contrast"
msgstr "Kontrast"
@@ -236,10 +237,10 @@ msgstr ""
"järele."
msgid "Milliseconds between photos in burst mode."
-msgstr "Fotode vahe seeriarežiimis millisekundites."
+msgstr "Viivitus sarivõtte fotode vahel millisekundites."
msgid "Number of photos in burst mode."
-msgstr "Fotode arv seeriarežiimis."
+msgstr "Fotode arv sarivõttes."
msgid "Photo Path"
msgstr "Fotode rada"
@@ -271,10 +272,10 @@ msgstr "Kaamera salvestatud pildi püstlahutus"
msgid ""
"The length of time, in milliseconds, to delay between taking each photo in a "
"burst sequence of photos."
-msgstr "Ajavahemik millisekundites seeriarežiimis tehtavate ülesvõetete vahel."
+msgstr "Ajavahemik millisekundites sarivõttel tehtavate ülesvõetete vahel."
msgid "The number of photos to take in a single burst."
-msgstr "Fotode arv, mitu võetakse ühes fotoseerias."
+msgstr "Fotode arv, mitu võetakse ühe sarivõttega."
msgid "The width resolution of the image captured from the camera"
msgstr "Kaamera salvestatud pildi rõhtlahutus"
@@ -311,7 +312,7 @@ msgstr "Seadme omadused pole toetatud"
#, c-format
msgid "Failed to initialize device %s for capability probing"
-msgstr "Tõrge seadme %s lähtestamisel selle omaduste tuvastamiseks"
+msgstr "Seadme %s lähtestamine võimaluste proovimiseks nurjus"
msgid "Unknown device"
msgstr "Tundmatu seade"
@@ -336,12 +337,18 @@ msgstr "�ks või enam Gstreameri elementi on puudu: "
msgid "%d "
msgstr "%d "
-msgid "Be verbose"
-msgstr "Teaberohke väljundi lubamine"
+msgid "No Effect"
+msgstr "Efekt puudub"
msgid "Enable wide mode"
msgstr "Lairežiimi lubamine"
+msgid "Device to use as a camera"
+msgstr "Seade, mida kasutatakse kaamerana"
+
+msgid "DEVICE"
+msgstr "SEADE"
+
msgid "Output version information and exit"
msgstr "Väljastab versiooniteabe ja väljub"
@@ -350,135 +357,10 @@ msgstr "- Veebikaamerast fotode ja videote salvestamine"
#, c-format
msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Võimalike käsureavõtmete täieliku nimekirja vaatamiseks käivita '%s --help'.\n"
+msgstr "Kõigi käsureavalikute nägemiseks käivita '%s --help'.\n"
msgid "Stop _Recording"
-msgstr "_Seiska salvestamine"
-
-#~ msgid "Switch to Burst Mode"
-#~ msgstr "Lülitu seeriarežiimile"
-
-#~ msgid "Switch to Photo Mode"
-#~ msgstr "Lülitumine fotorežiimile"
-
-#~ msgid "Switch to Video Mode"
-#~ msgstr "Lülitumine videorežiimile"
-
-#~ msgid "Switch to the Effects Selector"
-#~ msgstr "Lülitumine efektivalijale"
-
-#~ msgid "Camera setup failed"
-#~ msgstr "Tõrge kaamera seadistamisel"
-
-#~ msgid "Mauve"
-#~ msgstr "Lillakas"
-
-#~ msgid "Noir/Blanc"
-#~ msgstr "Sünge"
-
-#~ msgid "Hulk"
-#~ msgstr "Rohenägu"
-
-#~ msgid "Vertical Flip"
-#~ msgstr "Püstine peegeldus"
-
-#~ msgid "Horizontal Flip"
-#~ msgstr "Rõhtne peegeldus"
-
-#~ msgid "Shagadelic"
-#~ msgstr "Pööriseline"
-
-#~ msgid "Vertigo"
-#~ msgstr "Ã?hmane"
-
-#~ msgid "Edge"
-#~ msgstr "Serv"
-
-#~ msgid "Dice"
-#~ msgstr "Hakitud"
-
-#~ msgid "Warp"
-#~ msgstr "Kõverpeegel"
-
-#~ msgid "No camera found!"
-#~ msgstr "Kaamerat ei leitud!"
-
-#~ msgid "Please refer to the help for further information."
-#~ msgstr "Täiendavate juhiste saamiseks vaata palun abiteavet."
-
-#~ msgid "_Skip"
-#~ msgstr "_Jäta vahele"
-
-#~ msgid "S_kip All"
-#~ msgstr "Jäta _kõik vahele"
-
-#~ msgid "Delete _All"
-#~ msgstr "Kus_tuta kõik"
-
-#~ msgid ""
-#~ "Failed to launch program to show:\n"
-#~ "%s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Tõrge programmi käivitamisel, et näidata:\n"
-#~ "%s\n"
-#~ "%s"
-
-#~ msgid "Save File"
-#~ msgstr "Faili salvestamine"
-
-#~ msgid "Could not save %s"
-#~ msgstr "Faili %s pole võimalik salvestada"
-
-#~ msgid "Error while deleting"
-#~ msgstr "Viga kustutamisel"
-
-#~ msgid "The file \"%s\" cannot be deleted. Details: %s"
-#~ msgstr "Faili \"%s\" pole võimalik kustutada. �ksikasjad: %s"
-
-#~ msgid "Are you sure you want to permanently delete the %'d selected item?"
-#~ msgid_plural ""
-#~ "Are you sure you want to permanently delete the %'d selected items?"
-#~ msgstr[0] "Kas soovid %'d valitud kirje jäädavalt kustutada?"
-#~ msgstr[1] "Kas soovid %'d valitud kirjet jäädavalt kustutada?"
-
-#~ msgid "Are you sure you want to permanently delete \"%s\"?"
-#~ msgstr "Kas soovid \"%s\" jäädavalt kustutada?"
-
-#~ msgid "If you delete an item, it will be permanently lost."
-#~ msgstr "Kui sa kirje kustutad, siis läheb see jäädavalt kaotsi."
-
-#~ msgid "Unknown Error"
-#~ msgstr "Tundmatu viga"
-
-#~ msgid "Cannot move file to trash, do you want to delete immediately?"
-#~ msgstr ""
-#~ "Faili pole võimalik prügikasti visata, kas soovid seda lihtsalt kustutada?"
-
-#~ msgid "The file \"%s\" cannot be moved to the trash. Details: %s"
-#~ msgstr "Faili \"%s\" pole võimalik prügikasti visata. �ksikasjad: %s"
-
-#~ msgid "Really move all photos and videos to the trash?"
-#~ msgstr "Kas eemaldada kõik prügikastis olevad fotod ja videod?"
-
-#~ msgid "_Move to Trash"
-#~ msgstr "Viska _prügikasti"
-
-#~ msgid "Unable to open help file for Cheese"
-#~ msgstr "Cheese'i abiteabe faili pole võimalik avada"
-
-#~ msgid "_Start Recording"
-#~ msgstr "Alusta _salvestamist"
-
-#~ msgid "Help on this Application"
-#~ msgstr "Abiteave selle rakenduse kohta"
-
-#~ msgid "Countdown"
-#~ msgstr "Loendur"
-
-#~ msgid "_Start recording"
-#~ msgstr "Alusta _salvestamist"
+msgstr "Seiska _salvestamine"
-#~ msgid "Check your GStreamer installation"
-#~ msgstr "Kontrolli oma Gstreameri paigaldust"
+msgid "No effects found"
+msgstr "Efekte ei leitud"
diff --git a/po/eu.po b/po/eu.po
index edf428b..d1eed2d 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,14 +1,14 @@
-# translation of eu.po to Basque
+# translation of eu_to_be_translate.po to Basque
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
#
# Iñaki Larrañaga Murgoitio <dooteo euskalgnu org>, 2008, 2009, 2010.
msgid ""
msgstr ""
-"Project-Id-Version: eu\n"
+"Project-Id-Version: eu_to_be_translate\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-02 15:40+0100\n"
-"PO-Revision-Date: 2010-03-27 15:07+0100\n"
+"POT-Creation-Date: 2010-09-22 10:03+0200\n"
+"PO-Revision-Date: 2010-09-22 10:02+0200\n"
"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo euskalgnu org>\n"
"Language-Team: Basque <itzulpena euskalgnu org>\n"
"MIME-Version: 1.0\n"
@@ -17,18 +17,199 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:113
+#: ../data/cheese-about.ui.h:1 ../data/cheese.desktop.in.in.h:1
+#: ../src/cheese-main.vala:102
msgid "Cheese"
msgstr "Cheese"
+#: ../data/cheese-about.ui.h:2
+msgid "Cheese Website"
+msgstr "Cheese-ren web gunea"
+
+#: ../data/cheese-about.ui.h:3 ../data/cheese.desktop.in.in.h:3
+msgid "Take photos and videos with your webcam, with fun graphical effects"
+msgstr ""
+"Hartu argazkiak eta bideoak web kameratik, efektu grafiko dibertigarriekin"
+
+#: ../data/cheese-about.ui.h:4
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see http://www.gnu.org/licenses/\n";
+msgstr ""
+"Programa hau software librea da; birbana eta/edo alda dezakezu Software "
+"Foundation-ek argitaratutako GNU Lizentzia Publiko Orokorraren 2. bertsioan, "
+"edo (nahiago baduzu) beste berriago batean, jasotako baldintzak betez gero.\n"
+"\n"
+"Programa hau erabilgarria izango delakoan banatzen da, baina, INOLAKO "
+"BERMERIK GABE; era berean, ez da bermatzen beraren EGOKITASUNA "
+"MERKATURATZEKO edo HELBURU PARTIKULARRETARAKO ERABILTZEKO. Argibide gehiago "
+"nahi izanez gero, ikus GNU Lizentzia Publiko Orokorra.\n"
+"\n"
+"Programa honekin batera GNU Lizentzia Publiko Orokorraren kopia bat jasoko "
+"zenuen. Bestela, ikusi http://www.gnu.org/licenses/\n";
+
+#: ../data/cheese-about.ui.h:10
+msgid "translator-credits"
+msgstr "Iñaki Larrañaga Murgoitio <dooteo euskalgnu org>"
+
+#: ../data/cheese-actions.ui.h:1
+msgid "Burst"
+msgstr "Lehertu"
+
+#: ../data/cheese-actions.ui.h:2
+msgid "Fullscreen"
+msgstr "Pantaila osoa"
+
+#: ../data/cheese-actions.ui.h:3
+msgid "Help _Contents"
+msgstr "Laguntzaren _edukia"
+
+#: ../data/cheese-actions.ui.h:4
+msgid "Move All to Trash"
+msgstr "Bota denak zakarrontzira"
+
+#: ../data/cheese-actions.ui.h:5
+msgid "Move to _Trash"
+msgstr "Bota _zakarrontzira"
+
+#: ../data/cheese-actions.ui.h:6
+msgid "Next Effects"
+msgstr "Hurrengo efektuak"
+
+#: ../data/cheese-actions.ui.h:7
+msgid "Previous Effects"
+msgstr "Aurreko efektuak"
+
+#: ../data/cheese-actions.ui.h:8
+msgid "Save _As"
+msgstr "Gorde _honela"
+
+#: ../data/cheese-actions.ui.h:9
+msgid "Take _Multiple Photos"
+msgstr "_Hartu hainbat argazki"
+
+#: ../data/cheese-actions.ui.h:10
+msgid "_About"
+msgstr "Honi _buruz"
+
+#: ../data/cheese-actions.ui.h:11
+msgid "_Cheese"
+msgstr "_Cheese"
+
+#: ../data/cheese-actions.ui.h:12
+msgid "_Delete"
+msgstr "_Ezabatu"
+
+#: ../data/cheese-actions.ui.h:13
+msgid "_Edit"
+msgstr "_Editatu"
+
+#: ../data/cheese-actions.ui.h:14 ../data/cheese-main-window.ui.h:1
+msgid "_Effects"
+msgstr "_Efektuak"
+
+#: ../data/cheese-actions.ui.h:15
+msgid "_Help"
+msgstr "_Laguntza"
+
+#: ../data/cheese-actions.ui.h:16
+msgid "_Open"
+msgstr "_Ireki"
+
+#: ../data/cheese-actions.ui.h:17
+msgid "_Photo"
+msgstr "_Argazkia"
+
+#: ../data/cheese-actions.ui.h:18
+msgid "_Preferences"
+msgstr "_Hobespenak"
+
+#: ../data/cheese-actions.ui.h:19
+msgid "_Quit"
+msgstr "Irte_n"
+
+#: ../data/cheese-actions.ui.h:20
+msgid "_Record a Video"
+msgstr "_Grabatu bideoa"
+
+#: ../data/cheese-actions.ui.h:21 ../data/cheese-main-window.ui.h:3
+msgid "_Take a Photo"
+msgstr "_Hartu argazki bat"
+
+#: ../data/cheese-actions.ui.h:22
+msgid "_Video"
+msgstr "_Bideoa"
+
+#: ../data/cheese-actions.ui.h:23
+msgid "_Wide Mode"
+msgstr "Modu _zabala"
+
+#: ../data/cheese-main-window.ui.h:2
+msgid "_Leave Fullscreen"
+msgstr "_Irten pantaila osotik"
+
+#: ../data/cheese-prefs.ui.h:1
+msgid "Brightness"
+msgstr "Distira"
+
+#: ../data/cheese-prefs.ui.h:2
+msgid "Burst mode"
+msgstr "Sorta modua"
+
+#: ../data/cheese-prefs.ui.h:3
+msgid "Contrast"
+msgstr "Kontrastea"
+
+#: ../data/cheese-prefs.ui.h:4
+msgid "Delay between photos (seconds)"
+msgstr "Atzerapena argazkien artean (seg.)"
+
+#: ../data/cheese-prefs.ui.h:5
+msgid "Device"
+msgstr "Gailua"
+
+#: ../data/cheese-prefs.ui.h:6
+msgid "Hue"
+msgstr "Ã?abardura"
+
+#: ../data/cheese-prefs.ui.h:7
+msgid "Image properties"
+msgstr "Irudiaren propietateak"
+
+#: ../data/cheese-prefs.ui.h:8
+msgid "Number of photos"
+msgstr "Argazki kopurua"
+
+#: ../data/cheese-prefs.ui.h:9
+msgid "Preferences"
+msgstr "Hobespenak"
+
+#: ../data/cheese-prefs.ui.h:10
+msgid "Resolution"
+msgstr "Bereizmena"
+
+#: ../data/cheese-prefs.ui.h:11
+msgid "Saturation"
+msgstr "Saturazioa"
+
+#: ../data/cheese-prefs.ui.h:12
+msgid "Webcam"
+msgstr "Web kamera"
+
#: ../data/cheese.desktop.in.in.h:2
msgid "Cheese Webcam Booth"
msgstr "Cheese-ren web kameraren kabina"
-#: ../data/cheese.desktop.in.in.h:3 ../src/cheese-commands-help.c:118
-msgid "Take photos and videos with your webcam, with fun graphical effects"
-msgstr "Hartu argazkiak eta bideoak web kameratik, efektu grafiko dibertigarriekin"
-
#. Translators: please note, that the effect names are
#. standarized and should not be translated
#: ../data/cheese.schemas.in.h:3
@@ -184,116 +365,45 @@ msgstr "Modu zabalean abiaraziko den edo ez"
msgid "Width resolution"
msgstr "Zabaleraren bereizmena"
-#: ../data/cheese.ui.h:1
-msgid "Switch to Burst Mode"
-msgstr "Aldatu sorta modura"
-
-#: ../data/cheese.ui.h:2
-msgid "Switch to Photo Mode"
-msgstr "Aldatu argazki modura"
-
-#: ../data/cheese.ui.h:3
-msgid "Switch to Video Mode"
-msgstr "Aldatu bideo modura"
-
-#: ../data/cheese.ui.h:4
-msgid "Switch to the Effects Selector"
-msgstr "Aldatu efektuen hautatzailera"
-
-#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:57 ../src/cheese-window.c:869
-msgid "_Effects"
-msgstr "_Efektuak"
-
-#: ../data/cheese.ui.h:6
-msgid "_Leave Fullscreen"
-msgstr "_Irten pantaila osotik"
-
-#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:68 ../src/cheese-window.c:59
-msgid "_Take a Photo"
-msgstr "_Hartu argazki bat"
-
-#: ../data/cheese-prefs.ui.h:1
-msgid "Brightness"
-msgstr "Distira"
-
-#: ../data/cheese-prefs.ui.h:2
-msgid "Burst mode"
-msgstr "Sorta modua"
-
-#: ../data/cheese-prefs.ui.h:3
-msgid "Contrast"
-msgstr "Kontrastea"
-
-#: ../data/cheese-prefs.ui.h:4
-msgid "Delay between photos (seconds)"
-msgstr "Atzerapena argazkien artean (seg.)"
-
-#: ../data/cheese-prefs.ui.h:5
-msgid "Device"
-msgstr "Gailua"
-
-#: ../data/cheese-prefs.ui.h:6
-msgid "Hue"
-msgstr "Ã?abardura"
-
-#: ../data/cheese-prefs.ui.h:7
-msgid "Image properties"
-msgstr "Irudiaren propietateak"
-
-#: ../data/cheese-prefs.ui.h:8
-msgid "Number of photos"
-msgstr "Argazki kopurua"
-
-#: ../data/cheese-prefs.ui.h:9 ../src/cheese-ui.h:44
-msgid "Preferences"
-msgstr "Hobespenak"
-
-#: ../data/cheese-prefs.ui.h:10
-msgid "Resolution"
-msgstr "Bereizmena"
-
-#: ../data/cheese-prefs.ui.h:11 ../src/cheese-effect-chooser.c:66
-msgid "Saturation"
-msgstr "Saturazioa"
-
-#: ../data/cheese-prefs.ui.h:12
-msgid "Webcam"
-msgstr "Web kamera"
-
-#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:632
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.vala:594
msgid "Shutter sound"
msgstr "Obturadorearen soinua"
-#: ../libcheese/cheese-avatar-chooser.c:236
+#: ../libcheese/cheese-avatar-chooser.c:238
msgid "Take a photo"
msgstr "Hartu argazki bat"
-#: ../libcheese/cheese-avatar-chooser.c:255
+#: ../libcheese/cheese-avatar-chooser.c:257
msgid "_Take a photo"
msgstr "_Hartu argazki bat"
-#: ../libcheese/cheese-avatar-chooser.c:270
+#: ../libcheese/cheese-avatar-chooser.c:272
msgid "_Discard photo"
msgstr "_Baztertu argazkia"
-#: ../libcheese/cheese-camera-device.c:327
+#: ../libcheese/cheese-camera-device.c:329
msgid "Device capabilities not supported"
msgstr "Gailuaren ahalmenak ez daude onartuta"
-#: ../libcheese/cheese-camera-device.c:488
+#: ../libcheese/cheese-camera-device.c:357
+#, c-format
+msgid "Failed to initialize device %s for capability probing"
+msgstr "Huts egin du %s gailua hasieratzean bere gaitasunak aztertzeko"
+
+#: ../libcheese/cheese-camera-device.c:515
msgid "Unknown device"
msgstr "Gailu ezezaguna"
-#: ../libcheese/cheese-camera-device.c:512
+#: ../libcheese/cheese-camera-device.c:539
msgid "Cancellable initialization not supported"
msgstr "Bertan behera utzi daitekeen hasieratzea ez dago onartua"
-#: ../libcheese/cheese-camera.c:1134
+#: ../libcheese/cheese-camera.c:1156
#, c-format
msgid "No device found"
msgstr "Ez da gailurik aurkitu"
-#: ../libcheese/cheese-camera.c:1153
+#: ../libcheese/cheese-camera.c:1175
msgid "One or more needed GStreamer elements are missing: "
msgstr "Gstreamer-en beharrezko elementu bat (edo gehiago) falta da: "
@@ -303,276 +413,200 @@ msgstr "Gstreamer-en beharrezko elementu bat (edo gehiago) falta da: "
#. * To enable to show the numbers in your own language, use %Id instead.
#. * Please leave the additional whitespace after the number
#.
-#: ../libcheese/cheese-countdown.c:436 ../libcheese/cheese-countdown.c:455
-#: ../libcheese/cheese-countdown.c:474
+#: ../libcheese/cheese-countdown.c:441 ../libcheese/cheese-countdown.c:460
+#: ../libcheese/cheese-countdown.c:479
#, c-format
msgid "%d "
msgstr "%d "
-#: ../src/cheese-commands-file.c:31
-msgid "_Skip"
-msgstr "_Saltatu"
-
-#: ../src/cheese-commands-file.c:32
-msgid "S_kip All"
-msgstr "Saltatu _guztiak"
-
-#: ../src/cheese-commands-file.c:33
-msgid "Delete _All"
-msgstr "Ezabatu _denak"
-
-#: ../src/cheese-commands-file.c:57
-#, c-format
-msgid ""
-"Failed to launch program to show:\n"
-"%s\n"
-"%s"
-msgstr ""
-"Huts egin du programa abiaraztean hau erakusteko:\n"
-"%s\n"
-"%s"
-
-#: ../src/cheese-commands-file.c:78
-msgid "Save File"
-msgstr "Gorde fitxategia"
-
-#: ../src/cheese-commands-file.c:116
-#, c-format
-msgid "Could not save %s"
-msgstr "Ezin izan da %s gorde"
-
-#: ../src/cheese-commands-file.c:139
-msgid "Error while deleting"
-msgstr "Errorea ezabatzean"
-
-#: ../src/cheese-commands-file.c:140
-#, c-format
-msgid "The file \"%s\" cannot be deleted. Details: %s"
-msgstr "\"%s\" fitxategia ezin da ezabatu. Xehetasunak: %s"
-
-#: ../src/cheese-commands-file.c:167
-#, c-format
-msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural "Are you sure you want to permanently delete the %'d selected items?"
-msgstr[0] "Ziur zaude hautatutako elementu %'d betirako ezabatzea nahi duzula?"
-msgstr[1] "Ziur zaude hautatutako %'d elementu betirako ezabatzea nahi dituzula?"
+#: ../src/cheese-effects-manager.vala:116
+msgid "No Effect"
+msgstr "Efekturik ez"
-#: ../src/cheese-commands-file.c:174
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\"?"
-msgstr "Ziur zaude \"%s\" betirako ezabatzea nahi duzula?"
+#: ../src/cheese-main.vala:37
+msgid "Enable wide mode"
+msgstr "Gaitu modu zabala"
-#: ../src/cheese-commands-file.c:177
-#, c-format
-msgid "If you delete an item, it will be permanently lost."
-msgstr "Elementu bat ezabatzen baduzu, betirako galduko da."
+#: ../src/cheese-main.vala:38
+msgid "Device to use as a camera"
+msgstr "Gailua kamera gisa erabiltzeko"
-#: ../src/cheese-commands-file.c:198
-msgid "Unknown Error"
-msgstr "Errore ezezaguna"
+#: ../src/cheese-main.vala:38
+msgid "DEVICE"
+msgstr "GAILUA"
-#: ../src/cheese-commands-file.c:228
-msgid "Cannot move file to trash, do you want to delete immediately?"
-msgstr "Ezin da fitxategia zakarrontzira bota, nahi duzu berehala ezabatzea?"
+#: ../src/cheese-main.vala:39
+msgid "Output version information and exit"
+msgstr "Erakutsi bertsioaren informazioa eta irten"
-#: ../src/cheese-commands-file.c:229
-#, c-format
-msgid "The file \"%s\" cannot be moved to the trash. Details: %s"
-msgstr "\"%s\" fitxategia ezin da zakarrontzira bota. Xehetasunak: %s"
+#: ../src/cheese-main.vala:66
+msgid "- Take photos and videos from your webcam"
+msgstr "- Hartu argazkiak eta bideoak web kameratik"
-#: ../src/cheese-commands-file.c:301
+#: ../src/cheese-main.vala:77
#, c-format
-msgid "Really move all photos and videos to the trash?"
-msgstr "Ziur zaude argazki eta bideo guztiak zakarrontzira bota nahi dituzula?"
-
-#: ../src/cheese-commands-file.c:309
-msgid "_Move to Trash"
-msgstr "_Bota zakarrontzira"
-
-#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:654
-msgid "Unable to open help file for Cheese"
-msgstr "Ezin da Cheese-ren laguntzako fitxategia ireki"
-
-#: ../src/cheese-commands-help.c:96
-msgid "translator-credits"
-msgstr "Iñaki Larrañaga Murgoitio <dooteo euskalgnu org>"
-
-#: ../src/cheese-commands-help.c:99
-msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-msgstr ""
-"Programa hau software librea da; birbana eta/edo alda dezakezu Software "
-"Foundation-ek argitaratutako GNU Lizentzia Publiko Orokorraren 2. bertsioan, "
-"edo (nahiago baduzu) beste berriago batean, jasotako baldintzak betez gero.\n"
-
-#: ../src/cheese-commands-help.c:103
-msgid ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-msgstr ""
-"Programa hau erabilgarria izango delakoan banatzen da, baina, INOLAKO "
-"BERMERIK GABE; era berean, ez da bermatzen beraren EGOKITASUNA "
-"MERKATURATZEKO edo HELBURU PARTIKULARRETARAKO ERABILTZEKO. Argibide gehiago "
-"nahi izanez gero, ikus GNU Lizentzia Publiko Orokorra.\n"
-
-#: ../src/cheese-commands-help.c:107
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>."
+msgid "Run '%s --help' to see a full list of available command line options.\n"
msgstr ""
-"Programa honekin batera GNU Lizentzia Publiko Orokorraren kopia bat jasoko "
-"zenuen. Bestela, ikusi <http://www.gnu.org/licenses/>."
+"Exekutatu %s --help' komando-lerroko aukera erabilgarrien zerrenda osoa "
+"ikusteko.\n"
-#: ../src/cheese-commands-help.c:124
-msgid "Cheese Website"
-msgstr "Cheese-ren web gunea"
+#: ../src/cheese-window.vala:689
+msgid "Stop _Recording"
+msgstr "_Utzi grabatzeari"
-#: ../src/cheese-effect-chooser.c:60
-msgid "No Effect"
-msgstr "Efekturik ez"
+#: ../src/cheese-window.vala:821
+msgid "No effects found"
+msgstr "Ez da efekturik aurkitu"
+
+#~ msgid "Switch to Burst Mode"
+#~ msgstr "Aldatu sorta modura"
+
+#~ msgid "Switch to Photo Mode"
+#~ msgstr "Aldatu argazki modura"
+
+#~ msgid "Switch to Video Mode"
+#~ msgstr "Aldatu bideo modura"
+
+#~ msgid "Switch to the Effects Selector"
+#~ msgstr "Aldatu efektuen hautatzailera"
+
+#~ msgid "_Skip"
+#~ msgstr "_Saltatu"
+
+#~ msgid "S_kip All"
+#~ msgstr "Saltatu _guztiak"
-#: ../src/cheese-effect-chooser.c:62
-msgid "Mauve"
-msgstr "Purpura argia"
+#~ msgid "Delete _All"
+#~ msgstr "Ezabatu _denak"
-#: ../src/cheese-effect-chooser.c:64
-msgid "Noir/Blanc"
-msgstr "Beltza/Zuria"
+#~ msgid ""
+#~ "Failed to launch program to show:\n"
+#~ "%s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Huts egin du programa abiaraztean hau erakusteko:\n"
+#~ "%s\n"
+#~ "%s"
-#: ../src/cheese-effect-chooser.c:68
-msgid "Hulk"
-msgstr "Erraldoia"
+#~ msgid "Save File"
+#~ msgstr "Gorde fitxategia"
-#: ../src/cheese-effect-chooser.c:70
-msgid "Vertical Flip"
-msgstr "Irauli bertikalki"
+#~ msgid "Could not save %s"
+#~ msgstr "Ezin izan da %s gorde"
-#: ../src/cheese-effect-chooser.c:72
-msgid "Horizontal Flip"
-msgstr "Irauli horizontalki"
+#~ msgid "Error while deleting"
+#~ msgstr "Errorea ezabatzean"
-#: ../src/cheese-effect-chooser.c:74
-msgid "Shagadelic"
-msgstr "Psikodelikoa"
+#~ msgid "The file \"%s\" cannot be deleted. Details: %s"
+#~ msgstr "\"%s\" fitxategia ezin da ezabatu. Xehetasunak: %s"
-#: ../src/cheese-effect-chooser.c:76
-msgid "Vertigo"
-msgstr "Zorabioa"
+#~ msgid "Are you sure you want to permanently delete the %'d selected item?"
+#~ msgid_plural ""
+#~ "Are you sure you want to permanently delete the %'d selected items?"
+#~ msgstr[0] ""
+#~ "Ziur zaude hautatutako elementu %'d betirako ezabatzea nahi duzula?"
+#~ msgstr[1] ""
+#~ "Ziur zaude hautatutako %'d elementu betirako ezabatzea nahi dituzula?"
-#: ../src/cheese-effect-chooser.c:78
-msgid "Edge"
-msgstr "Ertza"
+#~ msgid "Are you sure you want to permanently delete \"%s\"?"
+#~ msgstr "Ziur zaude \"%s\" betirako ezabatzea nahi duzula?"
-#: ../src/cheese-effect-chooser.c:80
-msgid "Dice"
-msgstr "Dadoak"
+#~ msgid "If you delete an item, it will be permanently lost."
+#~ msgstr "Elementu bat ezabatzen baduzu, betirako galduko da."
-#: ../src/cheese-effect-chooser.c:82
-msgid "Warp"
-msgstr "Okertu"
+#~ msgid "Unknown Error"
+#~ msgstr "Errore ezezaguna"
-#: ../src/cheese-no-camera.c:94
-msgid "No camera found!"
-msgstr "Ez da kamerarik aurkitu!"
+#~ msgid "Cannot move file to trash, do you want to delete immediately?"
+#~ msgstr ""
+#~ "Ezin da fitxategia zakarrontzira bota, nahi duzu berehala ezabatzea?"
-#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1219
-msgid "Please refer to the help for further information."
-msgstr "Irakurri laguntza informazio gehiagorako."
+#~ msgid "The file \"%s\" cannot be moved to the trash. Details: %s"
+#~ msgstr "\"%s\" fitxategia ezin da zakarrontzira bota. Xehetasunak: %s"
-#: ../src/cheese-ui.h:32
-msgid "_Cheese"
-msgstr "_Cheese"
+#~ msgid "Really move all photos and videos to the trash?"
+#~ msgstr ""
+#~ "Ziur zaude argazki eta bideo guztiak zakarrontzira bota nahi dituzula?"
-#: ../src/cheese-ui.h:34
-msgid "_Edit"
-msgstr "_Editatu"
+#~ msgid "_Move to Trash"
+#~ msgstr "_Bota zakarrontzira"
-#: ../src/cheese-ui.h:35
-msgid "_Help"
-msgstr "_Laguntza"
+#~ msgid "Unable to open help file for Cheese"
+#~ msgstr "Ezin da Cheese-ren laguntzako fitxategia ireki"
-#: ../src/cheese-ui.h:38
-msgid "_Contents"
-msgstr "_Edukia"
+#~ msgid ""
+#~ "This program is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ msgstr ""
+#~ "Programa hau software librea da; birbana eta/edo alda dezakezu Software "
+#~ "Foundation-ek argitaratutako GNU Lizentzia Publiko Orokorraren 2. "
+#~ "bertsioan, edo (nahiago baduzu) beste berriago batean, jasotako "
+#~ "baldintzak betez gero.\n"
-#: ../src/cheese-ui.h:38
-msgid "Help on this Application"
-msgstr "Aplikazioaren laguntza"
+#~ msgid ""
+#~ "This program is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General "
+#~ "Public License for more details.\n"
+#~ msgstr ""
+#~ "Programa hau erabilgarria izango delakoan banatzen da, baina, INOLAKO "
+#~ "BERMERIK GABE; era berean, ez da bermatzen beraren EGOKITASUNA "
+#~ "MERKATURATZEKO edo HELBURU PARTIKULARRETARAKO ERABILTZEKO. Argibide "
+#~ "gehiago nahi izanez gero, ikus GNU Lizentzia Publiko Orokorra.\n"
-#: ../src/cheese-ui.h:48
-msgid "_Photo"
-msgstr "_Argazkia"
-
-#: ../src/cheese-ui.h:49
-msgid "_Video"
-msgstr "_Bideoa"
+#~ msgid ""
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with this program. If not, see <http://www.gnu.org/licenses/>."
+#~ msgstr ""
+#~ "Programa honekin batera GNU Lizentzia Publiko Orokorraren kopia bat "
+#~ "jasoko zenuen. Bestela, ikusi <http://www.gnu.org/licenses/>."
-#: ../src/cheese-ui.h:50
-msgid "_Burst"
-msgstr "_Sorta"
+#~ msgid "Mauve"
+#~ msgstr "Purpura argia"
-#: ../src/cheese-ui.h:54
-msgid "Countdown"
-msgstr "Atzekoz aurrera zenbatzea"
+#~ msgid "Noir/Blanc"
+#~ msgstr "Beltza/Zuria"
-#: ../src/cheese-ui.h:64
-msgid "_Wide mode"
-msgstr "Modu _zabala"
-
-#: ../src/cheese-ui.h:71
-msgid "_Recording"
-msgstr "_Grabazioa"
+#~ msgid "Hulk"
+#~ msgstr "Erraldoia"
-#: ../src/cheese-ui.h:74 ../src/cheese-window.c:62
-msgid "_Take multiple Photos"
-msgstr "_Hartu hainbat argazki"
+#~ msgid "Vertical Flip"
+#~ msgstr "Irauli bertikalki"
-#: ../src/cheese-ui.h:78
-msgid "_Open"
-msgstr "_Ireki"
+#~ msgid "Horizontal Flip"
+#~ msgstr "Irauli horizontalki"
-#: ../src/cheese-ui.h:80
-msgid "Save _Asâ?¦"
-msgstr "Gorde _honela..."
+#~ msgid "Shagadelic"
+#~ msgstr "Psikodelikoa"
-#: ../src/cheese-ui.h:82
-msgid "Move to _Trash"
-msgstr "Bota _zakarrontzira"
+#~ msgid "Vertigo"
+#~ msgstr "Zorabioa"
-#: ../src/cheese-ui.h:84
-msgid "Delete"
-msgstr "Ezabatu"
+#~ msgid "Edge"
+#~ msgstr "Ertza"
-#: ../src/cheese-ui.h:89
-msgid "Move All to Trash"
-msgstr "Bota denak zakarrontzira"
+#~ msgid "Dice"
+#~ msgstr "Dadoak"
-#: ../src/cheese-window.c:60
-msgid "_Start Recording"
-msgstr "_Hasi grabazioa"
+#~ msgid "Warp"
+#~ msgstr "Okertu"
-#: ../src/cheese-window.c:61
-msgid "_Stop Recording"
-msgstr "_Utzi grabatzeari"
+#~ msgid "No camera found!"
+#~ msgstr "Ez da kamerarik aurkitu!"
-#: ../src/cheese.c:96
-msgid "Be verbose"
-msgstr "Hitzez hitz"
+#~ msgid "Please refer to the help for further information."
+#~ msgstr "Irakurri laguntza informazio gehiagorako."
-#: ../src/cheese.c:98
-msgid "Enable wide mode"
-msgstr "Gaitu modu zabala"
+#~ msgid "Help on this Application"
+#~ msgstr "Aplikazioaren laguntza"
-#: ../src/cheese.c:100
-msgid "output version information and exit"
-msgstr "bertsioaren informazioa erakutsi eta irten"
+#~ msgid "Countdown"
+#~ msgstr "Atzekoz aurrera zenbatzea"
-#: ../src/cheese.c:115
-msgid "- Take photos and videos with your webcam, with fun graphical effects"
-msgstr "- Hartu argazkiak eta bideoak web kameratik, efektu grafiko dibertigarriekin"
+#~ msgid "_Start Recording"
+#~ msgstr "_Hasi grabazioa"
+#~ msgid "Be verbose"
+#~ msgstr "Hitzez hitz"
diff --git a/po/fr.po b/po/fr.po
index 925a646..e9696ed 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,7 +15,7 @@ msgstr ""
"Project-Id-Version: cheese HEAD\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
"product=cheese&component=general\n"
-"POT-Creation-Date: 2010-01-21 15:03+0000\n"
+"POT-Creation-Date: 2010-08-13 15:31+0000\n"
"PO-Revision-Date: 2010-01-26 21:58+0100\n"
"Last-Translator: Pablo Martin-Gomez <pablo martin-gomez laposte net>\n"
"Language-Team: GNOME French Team <gnomefr traduc org>\n"
@@ -24,7 +24,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-#: ../data/cheese.desktop.in.in.h:1 ../data/cheese.ui.h:1 ../src/cheese.c:118
+#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:118
msgid "Cheese"
msgstr "Cheese"
@@ -32,7 +32,7 @@ msgstr "Cheese"
msgid "Cheese Webcam Booth"
msgstr "Studio webcam Cheese"
-#: ../data/cheese.desktop.in.in.h:3 ../src/cheese-window.c:1065
+#: ../data/cheese.desktop.in.in.h:3 ../src/cheese-commands-help.c:118
msgid "Take photos and videos with your webcam, with fun graphical effects"
msgstr ""
"Prise de photos et enregistrement de vidéos grâce à votre webcam avec effets "
@@ -148,14 +148,18 @@ msgid "Set to True to show countdown when taking a photo"
msgstr "Si vrai, un retardateur est affiché à la prise de photo"
#: ../data/cheese.schemas.in.h:23
+msgid "Set to True to use flash when taking a photo"
+msgstr "Si vrai, le flash est utilisé à la prise de photo"
+
+#: ../data/cheese.schemas.in.h:24
msgid "The device which points to the camera (e.g. /dev/video0)"
msgstr "Le périphérique qui pointe vers la caméra (par ex. /dev/video0)"
-#: ../data/cheese.schemas.in.h:24
+#: ../data/cheese.schemas.in.h:25
msgid "The height resolution of the image captured from the camera"
msgstr "Résolution verticale de l'image acquise de la caméra"
-#: ../data/cheese.schemas.in.h:25
+#: ../data/cheese.schemas.in.h:26
msgid ""
"The length of time, in milliseconds, to delay between taking each photo in a "
"burst sequence of photos."
@@ -163,61 +167,63 @@ msgstr ""
"La délai temporel, en millisecondes, entre chaque prise de photo en mode "
"rafale."
-#: ../data/cheese.schemas.in.h:26
+#: ../data/cheese.schemas.in.h:27
msgid "The number of photos to take in a single burst."
msgstr "Le nombre de photos à prendre dans une seule rafale."
-#: ../data/cheese.schemas.in.h:27
+#: ../data/cheese.schemas.in.h:28
msgid "The width resolution of the image captured from the camera"
msgstr "Résolution horizontale de l'image acquise de la caméra"
-#: ../data/cheese.schemas.in.h:28
+#: ../data/cheese.schemas.in.h:29
msgid "Use a countdown"
msgstr "Utiliser un retardateur"
-#: ../data/cheese.schemas.in.h:29
+#: ../data/cheese.schemas.in.h:30
+msgid "Use a flash"
+msgstr "Utiliser un flash"
+
+#: ../data/cheese.schemas.in.h:31
msgid "Video Path"
msgstr "Emplacement des vidéos"
-#: ../data/cheese.schemas.in.h:30
+#: ../data/cheese.schemas.in.h:32
msgid "Whether to enable immediate deletion"
msgstr "Indique s'il faut activer la suppression immédiate"
-#: ../data/cheese.schemas.in.h:31
+#: ../data/cheese.schemas.in.h:33
msgid "Whether to start in wide mode"
msgstr "Indique s'il faut démarrer en mode large"
-#: ../data/cheese.schemas.in.h:32
+#: ../data/cheese.schemas.in.h:34
msgid "Width resolution"
msgstr "Résolution verticale"
-#: ../data/cheese.ui.h:2
+#: ../data/cheese.ui.h:1
msgid "Switch to Burst Mode"
msgstr "Basculer en mode rafale"
-#: ../data/cheese.ui.h:3
+#: ../data/cheese.ui.h:2
msgid "Switch to Photo Mode"
msgstr "Basculer en mode photo"
-#: ../data/cheese.ui.h:4
+#: ../data/cheese.ui.h:3
msgid "Switch to Video Mode"
msgstr "Basculer en mode vidéo"
-#: ../data/cheese.ui.h:5
+#: ../data/cheese.ui.h:4
msgid "Switch to the Effects Selector"
msgstr "Basculer vers le sélecteur d'effets"
-#: ../data/cheese.ui.h:6 ../src/cheese-window.c:1176
-#: ../src/cheese-window.c:1499
+#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:61 ../src/cheese-window.c:884
msgid "_Effects"
msgstr "_Effets"
-#: ../data/cheese.ui.h:7
+#: ../data/cheese.ui.h:6
msgid "_Leave Fullscreen"
msgstr "_Quitter le mode plein écran"
-#: ../data/cheese.ui.h:8 ../src/cheese-window.c:1532
-#: ../src/cheese-window.c:1552
+#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:72 ../src/cheese-window.c:59
msgid "_Take a Photo"
msgstr "P_rendre une photo"
@@ -253,7 +259,7 @@ msgstr "Propriétés de l'image"
msgid "Number of photos"
msgstr "Nombre de photos"
-#: ../data/cheese-prefs.ui.h:9 ../src/cheese-window.c:1503
+#: ../data/cheese-prefs.ui.h:9 ../src/cheese-ui.h:44
msgid "Preferences"
msgstr "Préférences"
@@ -269,28 +275,40 @@ msgstr "Saturation"
msgid "Webcam"
msgstr "Webcam"
-#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:1238
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:640
msgid "Shutter sound"
msgstr "Bruit de l'obturateur"
-#: ../libcheese/cheese-avatar-chooser.c:222
+#: ../libcheese/cheese-avatar-chooser.c:236
msgid "Take a photo"
msgstr "Prendre une photo"
-#: ../libcheese/cheese-avatar-chooser.c:241 ../src/cheese-window.c:1732
+#: ../libcheese/cheese-avatar-chooser.c:255
msgid "_Take a photo"
msgstr "P_rendre une photo"
-#: ../libcheese/cheese-avatar-chooser.c:256
+#: ../libcheese/cheese-avatar-chooser.c:270
msgid "_Discard photo"
msgstr "_Rejeter la photo"
-#: ../libcheese/cheese-camera.c:1118
+#: ../libcheese/cheese-camera-device.c:328
+msgid "Device capabilities not supported"
+msgstr "Capacités du périphérique non prises en charge"
+
+#: ../libcheese/cheese-camera-device.c:510
+msgid "Unknown device"
+msgstr "Périphérique inconnu"
+
+#: ../libcheese/cheese-camera-device.c:534
+msgid "Cancellable initialization not supported"
+msgstr "Initialisation annulable non prise en charge"
+
+#: ../libcheese/cheese-camera.c:1137
#, c-format
msgid "No device found"
msgstr "Aucun périphérique détecté"
-#: ../libcheese/cheese-camera.c:1137
+#: ../libcheese/cheese-camera.c:1156
msgid "One or more needed GStreamer elements are missing: "
msgstr "Un ou plusieurs éléments GStreamer sont manquants : "
@@ -300,93 +318,25 @@ msgstr "Un ou plusieurs éléments GStreamer sont manquants : "
#. * To enable to show the numbers in your own language, use %Id instead.
#. * Please leave the additional whitespace after the number
#.
-#: ../libcheese/cheese-countdown.c:436 ../libcheese/cheese-countdown.c:455
-#: ../libcheese/cheese-countdown.c:474
+#: ../libcheese/cheese-countdown.c:441 ../libcheese/cheese-countdown.c:460
+#: ../libcheese/cheese-countdown.c:479
#, c-format
msgid "%d "
msgstr "%d "
-#: ../libcheese/cheese-widget.c:289 ../libcheese/cheese-widget.c:391
-msgid "Camera setup failed"
-msgstr "�chec de la configuration de la caméra"
-
-#: ../libcheese/cheese-camera-device.c:326
-msgid "Device capabilities not supported"
-msgstr "Capacités du périphérique non prises en charge"
-
-#: ../libcheese/cheese-camera-device.c:485
-msgid "Unknown device"
-msgstr "Périphérique inconnu"
-
-#: ../libcheese/cheese-camera-device.c:509
-msgid "Cancellable initialization not supported"
-msgstr "Initialisation annulable non prise en charge"
-
-#: ../src/cheese-effect-chooser.c:60
-msgid "No Effect"
-msgstr "Aucun effet"
-
-#: ../src/cheese-effect-chooser.c:62
-msgid "Mauve"
-msgstr "Mauve"
-
-#: ../src/cheese-effect-chooser.c:64
-msgid "Noir/Blanc"
-msgstr "Noir/Blanc"
-
-#: ../src/cheese-effect-chooser.c:68
-msgid "Hulk"
-msgstr "Hulk"
-
-#: ../src/cheese-effect-chooser.c:70
-msgid "Vertical Flip"
-msgstr "Miroir vertical"
-
-#: ../src/cheese-effect-chooser.c:72
-msgid "Horizontal Flip"
-msgstr "Miroir horizontal"
-
-#: ../src/cheese-effect-chooser.c:74
-msgid "Shagadelic"
-msgstr "Shagadélique !"
-
-#: ../src/cheese-effect-chooser.c:76
-msgid "Vertigo"
-msgstr "Vertigo"
-
-#: ../src/cheese-effect-chooser.c:78
-msgid "Edge"
-msgstr "Contours"
-
-#: ../src/cheese-effect-chooser.c:80
-msgid "Dice"
-msgstr "En petits dés"
-
-#: ../src/cheese-effect-chooser.c:82
-msgid "Warp"
-msgstr "Déformer"
-
-#: ../src/cheese-no-camera.c:93
-msgid "No camera found!"
-msgstr "Aucune caméra détectée !"
-
-#: ../src/cheese-no-camera.c:94
-msgid "Please refer to the help for further information."
-msgstr "Veuillez consulter l'aide pour plus d'informations."
-
-#: ../src/cheese-window.c:81
+#: ../src/cheese-commands-file.c:31
msgid "_Skip"
msgstr "_Ignorer"
-#: ../src/cheese-window.c:82
+#: ../src/cheese-commands-file.c:32
msgid "S_kip All"
msgstr "T_out ignorer"
-#: ../src/cheese-window.c:83
+#: ../src/cheese-commands-file.c:33
msgid "Delete _All"
msgstr "_Tout supprimer"
-#: ../src/cheese-window.c:641
+#: ../src/cheese-commands-file.c:57
#, c-format
msgid ""
"Failed to launch program to show:\n"
@@ -397,25 +347,25 @@ msgstr ""
"%s\n"
"%s"
-#: ../src/cheese-window.c:662
+#: ../src/cheese-commands-file.c:78
msgid "Save File"
msgstr "Enregistrer le fichier"
-#: ../src/cheese-window.c:700
+#: ../src/cheese-commands-file.c:116
#, c-format
msgid "Could not save %s"
msgstr "Impossible d'enregistrer %s"
-#: ../src/cheese-window.c:723
+#: ../src/cheese-commands-file.c:139
msgid "Error while deleting"
msgstr "Erreur à la suppression"
-#: ../src/cheese-window.c:724
+#: ../src/cheese-commands-file.c:140
#, c-format
msgid "The file \"%s\" cannot be deleted. Details: %s"
msgstr "Le fichier « %s » ne peut pas être supprimé. Détails : %s"
-#: ../src/cheese-window.c:751
+#: ../src/cheese-commands-file.c:167
#, c-format
msgid "Are you sure you want to permanently delete the %'d selected item?"
msgid_plural ""
@@ -425,46 +375,46 @@ msgstr[0] ""
msgstr[1] ""
"Voulez-vous vraiment supprimer définitivement les %'d éléments sélectionnés ?"
-#: ../src/cheese-window.c:758
+#: ../src/cheese-commands-file.c:174
#, c-format
msgid "Are you sure you want to permanently delete \"%s\"?"
msgstr "Voulez-vous vraiment supprimer définitivement « %s » ?"
-#: ../src/cheese-window.c:761
+#: ../src/cheese-commands-file.c:177
#, c-format
msgid "If you delete an item, it will be permanently lost."
msgstr "Si vous supprimer un élément, il sera définitivement perdu."
-#: ../src/cheese-window.c:782
+#: ../src/cheese-commands-file.c:198
msgid "Unknown Error"
msgstr "Erreur inconnue"
-#: ../src/cheese-window.c:812
+#: ../src/cheese-commands-file.c:228
msgid "Cannot move file to trash, do you want to delete immediately?"
msgstr ""
"Impossible de déplacer le fichier dans la corbeille, voulez-vous le "
"supprimer immédiatement ?"
-#: ../src/cheese-window.c:813
+#: ../src/cheese-commands-file.c:229
#, c-format
msgid "The file \"%s\" cannot be moved to the trash. Details: %s"
msgstr "Le fichier « %s » ne peut être mis à la corbeille. Détails : %s"
-#: ../src/cheese-window.c:885
+#: ../src/cheese-commands-file.c:301
#, c-format
msgid "Really move all photos and videos to the trash?"
msgstr ""
"Voulez-vous vraiment mettre toutes les photos et les vidéos à la corbeille ?"
-#: ../src/cheese-window.c:893
+#: ../src/cheese-commands-file.c:309
msgid "_Move to Trash"
msgstr "_Mettre à la corbeille"
-#: ../src/cheese-window.c:986 ../src/cheese-window.c:1260
+#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:662
msgid "Unable to open help file for Cheese"
msgstr "Impossible d'ouvrir le fichier d'aide de Cheese"
-#: ../src/cheese-window.c:1043
+#: ../src/cheese-commands-help.c:96
msgid "translator-credits"
msgstr ""
"Pierre Slamich <pierre slamich gmail com>, 2007.\n"
@@ -474,7 +424,7 @@ msgstr ""
"Jonathan Ernst <jonathan ernstfamily ch>, 2009.\n"
"Pablo Martin-Gomez <pablo martin-gomez laposte net>, 2010."
-#: ../src/cheese-window.c:1046
+#: ../src/cheese-commands-help.c:99
msgid ""
"This program is free software; you can redistribute it and/or modify it "
"under the terms of the GNU General Public License as published by the Free "
@@ -486,7 +436,7 @@ msgstr ""
"publiée par la Free Software Foundation ; soit la version 2 de la Licence, "
"ou (à votre discrétion) une version ultérieure quelconque.\n"
-#: ../src/cheese-window.c:1050
+#: ../src/cheese-commands-help.c:103
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -498,7 +448,7 @@ msgstr ""
"CONFORMIT� � UNE UTILISATION PARTICULI�RE. Voir la Licence Publique Générale "
"GNU pour plus de détails.\n"
-#: ../src/cheese-window.c:1054
+#: ../src/cheese-commands-help.c:107
msgid ""
"You should have received a copy of the GNU General Public License along with "
"this program. If not, see <http://www.gnu.org/licenses/>."
@@ -507,93 +457,141 @@ msgstr ""
"avec ce programme ; si ce n'est pas le cas, consultez <http://www.gnu.org/";
"licenses/>."
-#: ../src/cheese-window.c:1071
+#: ../src/cheese-commands-help.c:124
msgid "Cheese Website"
msgstr "Site Web de Cheese"
-#: ../src/cheese-window.c:1276
-msgid "_Start Recording"
-msgstr "Dé_marrer l'enregistrement"
+#: ../src/cheese-effect-chooser.c:60
+msgid "No Effect"
+msgstr "Aucun effet"
-#: ../src/cheese-window.c:1444
-msgid "_Stop Recording"
-msgstr "_Arrêter l'enregistrement"
+#: ../src/cheese-effect-chooser.c:62
+msgid "Mauve"
+msgstr "Mauve"
+
+#: ../src/cheese-effect-chooser.c:64
+msgid "Noir/Blanc"
+msgstr "Noir/Blanc"
+
+#: ../src/cheese-effect-chooser.c:68
+msgid "Hulk"
+msgstr "Hulk"
+
+#: ../src/cheese-effect-chooser.c:70
+msgid "Vertical Flip"
+msgstr "Miroir vertical"
+
+#: ../src/cheese-effect-chooser.c:72
+msgid "Horizontal Flip"
+msgstr "Miroir horizontal"
+
+#: ../src/cheese-effect-chooser.c:74
+msgid "Shagadelic"
+msgstr "Shagadélique !"
+
+#: ../src/cheese-effect-chooser.c:76
+msgid "Vertigo"
+msgstr "Vertigo"
+
+#: ../src/cheese-effect-chooser.c:78
+msgid "Edge"
+msgstr "Contours"
+
+#: ../src/cheese-effect-chooser.c:80
+msgid "Dice"
+msgstr "En petits dés"
+
+#: ../src/cheese-effect-chooser.c:82
+msgid "Warp"
+msgstr "Déformer"
+
+#: ../src/cheese-no-camera.c:94
+msgid "No camera found!"
+msgstr "Aucune caméra détectée !"
+
+#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1258
+msgid "Please refer to the help for further information."
+msgstr "Veuillez consulter l'aide pour plus d'informations."
-#: ../src/cheese-window.c:1480
+#: ../src/cheese-ui.h:32
msgid "_Cheese"
msgstr "_Cheese"
-#: ../src/cheese-window.c:1482
+#: ../src/cheese-ui.h:34
msgid "_Edit"
msgstr "Ã?_dition"
-#: ../src/cheese-window.c:1483
-msgid "Move All to Trash"
-msgstr "Tout mettre à la corbeille"
-
-#: ../src/cheese-window.c:1486
+#: ../src/cheese-ui.h:35
msgid "_Help"
msgstr "Aid_e"
-#: ../src/cheese-window.c:1489
+#: ../src/cheese-ui.h:38
msgid "_Contents"
msgstr "_Sommaire"
-#: ../src/cheese-window.c:1489
+#: ../src/cheese-ui.h:38
msgid "Help on this Application"
msgstr "Aide concernant cette application"
-#: ../src/cheese-window.c:1495
-msgid "Countdown"
-msgstr "Retardateur"
-
-#: ../src/cheese-window.c:1511
-msgid "_Wide mode"
-msgstr "Mode _large"
-
-#: ../src/cheese-window.c:1515
+#: ../src/cheese-ui.h:48
msgid "_Photo"
msgstr "_Photo"
-#: ../src/cheese-window.c:1516
+#: ../src/cheese-ui.h:49
msgid "_Video"
msgstr "_Vidéo"
-#: ../src/cheese-window.c:1517
+#: ../src/cheese-ui.h:50
msgid "_Burst"
msgstr "_Rafale"
-#: ../src/cheese-window.c:1521
+#: ../src/cheese-ui.h:54
+msgid "Countdown"
+msgstr "Retardateur"
+
+#: ../src/cheese-ui.h:57
+msgid "Flash"
+msgstr "Flash"
+
+#: ../src/cheese-ui.h:68
+msgid "_Wide mode"
+msgstr "Mode _large"
+
+#: ../src/cheese-ui.h:75
+msgid "_Recording"
+msgstr "_Enregistrement"
+
+#: ../src/cheese-ui.h:78 ../src/cheese-window.c:62
+msgid "_Take multiple Photos"
+msgstr "P_rendre plusieurs photos"
+
+#: ../src/cheese-ui.h:82
msgid "_Open"
msgstr "_Ouvrir"
-#: ../src/cheese-window.c:1523
+#: ../src/cheese-ui.h:84
msgid "Save _Asâ?¦"
msgstr "Enregistrer _sousâ?¦"
-#: ../src/cheese-window.c:1525
+#: ../src/cheese-ui.h:86
msgid "Move to _Trash"
msgstr "_Mettre à la corbeille"
-#: ../src/cheese-window.c:1527
+#: ../src/cheese-ui.h:88
msgid "Delete"
msgstr "Supprimer"
-#: ../src/cheese-window.c:1536
-msgid "_Recording"
-msgstr "_Enregistrement"
-
-#: ../src/cheese-window.c:1540 ../src/cheese-window.c:1565
-msgid "_Take multiple Photos"
-msgstr "P_rendre plusieurs photos"
+#: ../src/cheese-ui.h:93
+msgid "Move All to Trash"
+msgstr "Tout mettre à la corbeille"
-#: ../src/cheese-window.c:1578
-msgid "_Start recording"
-msgstr "_Démarrer l'enregistrement"
+#: ../src/cheese-window.c:60
+msgid "_Start Recording"
+msgstr "Dé_marrer l'enregistrement"
-#: ../src/cheese-window.c:1969
-msgid "Check your GStreamer installation"
-msgstr "Vérifiez votre installation de GStreamer"
+#: ../src/cheese-window.c:61
+msgid "_Stop Recording"
+msgstr "_Arrêter l'enregistrement"
#: ../src/cheese.c:97
msgid "Be verbose"
@@ -603,7 +601,7 @@ msgstr "Mode bavard"
msgid "Enable wide mode"
msgstr "Active le mode large"
-#: ../src/cheese.c:103
+#: ../src/cheese.c:101
msgid "output version information and exit"
msgstr "affiche les informations de version et quitte"
@@ -612,15 +610,3 @@ msgid "- Take photos and videos with your webcam, with fun graphical effects"
msgstr ""
"- Prise de photos et enregistrement de vidéos grâce à votre webcam, et avec "
"effets graphiques rigolos"
-
-#~ msgid "Could not set the Account Photo"
-#~ msgstr "Impossible de définir la photo du compte"
-
-#~ msgid "_Set As Account Photo"
-#~ msgstr "_Définir comme photo du compte"
-
-#~ msgid "Send by _Mail"
-#~ msgstr "Envoyer par _courriel"
-
-#~ msgid "Send _To"
-#~ msgstr "En_voyer à "
diff --git a/po/gl.po b/po/gl.po
index 7af5f8e..5e1823c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: cheese.master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 12:40+0200\n"
-"PO-Revision-Date: 2010-08-03 12:40+0200\n"
+"POT-Creation-Date: 2010-08-16 10:28+0200\n"
+"PO-Revision-Date: 2010-08-16 10:28+0200\n"
"Last-Translator: Fran Dieguez <frandieguez ubuntu com>\n"
"Language-Team: Galician <gnome-gl-list gnome org>\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#: ../data/cheese-about.ui.h:1 ../data/cheese.desktop.in.in.h:1
-#: ../src/cheese-main.vala:105
+#: ../src/cheese-main.vala:102
msgid "Cheese"
msgstr "Cheese"
@@ -380,47 +380,47 @@ msgstr "Cando comezar en modo amplo"
msgid "Width resolution"
msgstr "Resolución da largura"
-#: ../libcheese/cheese-avatar-chooser.c:110
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.vala:589
msgid "Shutter sound"
msgstr "Son do obturador"
-#: ../libcheese/cheese-avatar-chooser.c:236
+#: ../libcheese/cheese-avatar-chooser.c:238
msgid "Take a photo"
msgstr "Sacar unha foto"
-#: ../libcheese/cheese-avatar-chooser.c:255
+#: ../libcheese/cheese-avatar-chooser.c:257
msgid "_Take a photo"
msgstr "_Sacar unha foto"
-#: ../libcheese/cheese-avatar-chooser.c:270
+#: ../libcheese/cheese-avatar-chooser.c:272
msgid "_Discard photo"
msgstr "_Desbotar a foto"
-#: ../libcheese/cheese-camera-device.c:328
+#: ../libcheese/cheese-camera-device.c:329
msgid "Device capabilities not supported"
msgstr "As capacidades do dispositivo non son compatÃbeis"
-#: ../libcheese/cheese-camera-device.c:352
+#: ../libcheese/cheese-camera-device.c:357
#, c-format
msgid "Failed to initialize device %s for capability probing"
msgstr ""
"Produciuse un fallo ao inicializar o dispositivo %s para a capacidade de "
"proba"
-#: ../libcheese/cheese-camera-device.c:510
+#: ../libcheese/cheese-camera-device.c:515
msgid "Unknown device"
msgstr "Dispositivo descoñecido"
-#: ../libcheese/cheese-camera-device.c:534
+#: ../libcheese/cheese-camera-device.c:539
msgid "Cancellable initialization not supported"
msgstr "A inicialización cancelábel non é compatÃbel"
-#: ../libcheese/cheese-camera.c:1128
+#: ../libcheese/cheese-camera.c:1154
#, c-format
msgid "No device found"
msgstr "Non se atopou ningún dispositivo"
-#: ../libcheese/cheese-camera.c:1147
+#: ../libcheese/cheese-camera.c:1173
msgid "One or more needed GStreamer elements are missing: "
msgstr "Falta un ou máis elementos necesarios de Gstreamer: "
@@ -436,37 +436,48 @@ msgstr "Falta un ou máis elementos necesarios de Gstreamer: "
msgid "%d "
msgstr "%d "
-#: ../src/cheese-main.vala:38
-msgid "Be verbose"
-msgstr "SaÃda detallada"
+#: ../src/cheese-effects-manager.vala:116
+msgid "No Effect"
+msgstr "Sen efectos"
-#: ../src/cheese-main.vala:39
+#: ../src/cheese-main.vala:37
msgid "Enable wide mode"
msgstr "Activar o modo amplo"
-#: ../src/cheese-main.vala:40
+#: ../src/cheese-main.vala:38
+msgid "Device to use as a camera"
+msgstr "Dispositivo a usar como cámara"
+
+#: ../src/cheese-main.vala:38
+msgid "DEVICE"
+msgstr "DISPOSITIVO"
+
+#: ../src/cheese-main.vala:39
msgid "Output version information and exit"
msgstr "Mostrar información da versión e saÃr"
-#: ../src/cheese-main.vala:75
+#: ../src/cheese-main.vala:66
msgid "- Take photos and videos from your webcam"
msgstr "- Tome fotografÃas e vÃdeos coa súa cámara web"
-#: ../src/cheese-main.vala:86
+#: ../src/cheese-main.vala:77
#, c-format
msgid "Run '%s --help' to see a full list of available command line options.\n"
msgstr ""
"Executar «%s --help» para ver unha lista completa de opcións de liña de ordes "
"dispoñÃbeis.\n"
-#: ../src/cheese-window.vala:604
+#: ../src/cheese-window.vala:646
msgid "Stop _Recording"
msgstr "_Deter a gravación"
-#: ../src/cheese-window.vala:723
+#: ../src/cheese-window.vala:765
msgid "No effects found"
msgstr "Non se atopou ningún efecto"
+#~ msgid "Be verbose"
+#~ msgstr "SaÃda detallada"
+
#~ msgid "Historical"
#~ msgstr "Hitorial"
@@ -479,9 +490,6 @@ msgstr "Non se atopou ningún efecto"
#~ msgid "Hulk"
#~ msgstr "Hulk"
-#~ msgid "No Effect"
-#~ msgstr "Sen efectos"
-
#~ msgid "Mauve"
#~ msgstr "Malva"
diff --git a/po/he.po b/po/he.po
index 31531de..ac9cbf4 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: 1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 10:41+0300\n"
-"PO-Revision-Date: 2010-08-03 10:42+0200\n"
+"POT-Creation-Date: 2010-08-09 12:45+0300\n"
+"PO-Revision-Date: 2010-08-09 12:46+0200\n"
"Last-Translator: Yaron Shahrabani <sh yaron gmail com>\n"
"Language-Team: he\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"X-Poedit-Language: Hebrew\n"
#: ../data/cheese-about.ui.h:1 ../data/cheese.desktop.in.in.h:1
-#: ../src/cheese-main.vala:105
+#: ../src/cheese-main.vala:103
msgid "Cheese"
msgstr "â??Cheese"
@@ -366,45 +366,45 @@ msgstr "Whether to start in wide mode"
msgid "Width resolution"
msgstr "Width resolution"
-#: ../libcheese/cheese-avatar-chooser.c:110
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.vala:589
msgid "Shutter sound"
msgstr "צ×?×?×? ×?צ×?צ×?"
-#: ../libcheese/cheese-avatar-chooser.c:236
+#: ../libcheese/cheese-avatar-chooser.c:238
msgid "Take a photo"
msgstr "צ×?×?×?×? ת×?×?× ×?"
-#: ../libcheese/cheese-avatar-chooser.c:255
+#: ../libcheese/cheese-avatar-chooser.c:257
msgid "_Take a photo"
msgstr "_צ×?×? ת×?×?× ×?"
-#: ../libcheese/cheese-avatar-chooser.c:270
+#: ../libcheese/cheese-avatar-chooser.c:272
msgid "_Discard photo"
msgstr "×?_תע×?×?×?ת ×?ת×?×?× ×?"
-#: ../libcheese/cheese-camera-device.c:328
+#: ../libcheese/cheese-camera-device.c:329
msgid "Device capabilities not supported"
msgstr "×?×?×?×?×?ת ×?×?תק×? ×?×?× ×? × ×ª×?×?×?ת"
-#: ../libcheese/cheese-camera-device.c:352
+#: ../libcheese/cheese-camera-device.c:357
#, c-format
msgid "Failed to initialize device %s for capability probing"
msgstr "×?רע ×?ש×? ×?×?פע×?ת ×?×?תק×? %s ×?תש×?×?×? ×?×?×?×?×?ת"
-#: ../libcheese/cheese-camera-device.c:510
+#: ../libcheese/cheese-camera-device.c:515
msgid "Unknown device"
msgstr "×?תק×? ×?×?ת×? ×?×?×?ר"
-#: ../libcheese/cheese-camera-device.c:534
+#: ../libcheese/cheese-camera-device.c:539
msgid "Cancellable initialization not supported"
msgstr "ת×?×?×?×? ×?פע×?×? ×?× ×?ת×? ×?×?×?×?×?×? ×?×?× ×? × ×ª×?×?"
-#: ../libcheese/cheese-camera.c:1128
+#: ../libcheese/cheese-camera.c:1154
#, c-format
msgid "No device found"
msgstr "×?×? × ×?צ×? ×?תק×?"
-#: ../libcheese/cheese-camera.c:1147
+#: ../libcheese/cheese-camera.c:1173
msgid "One or more needed GStreamer elements are missing: "
msgstr "ר×?×?×? ×?×?×? ×?×? ×?×?תר ש×? gstreamer ×?סר: "
@@ -420,36 +420,43 @@ msgstr "ר×?×?×? ×?×?×? ×?×? ×?×?תר ש×? gstreamer ×?סר: "
msgid "%d "
msgstr "%d "
-#: ../src/cheese-main.vala:38
-msgid "Be verbose"
-msgstr "Be verbose"
-
-#: ../src/cheese-main.vala:39
+#: ../src/cheese-main.vala:37
msgid "Enable wide mode"
msgstr "Enable wide mode"
-#: ../src/cheese-main.vala:40
+#: ../src/cheese-main.vala:38
+msgid "Device to use as a camera"
+msgstr "Device to use as a camera"
+
+#: ../src/cheese-main.vala:38
+msgid "DEVICE"
+msgstr "DEVICE"
+
+#: ../src/cheese-main.vala:39
msgid "Output version information and exit"
msgstr "Output version information and exit"
-#: ../src/cheese-main.vala:75
+#: ../src/cheese-main.vala:67
msgid "- Take photos and videos from your webcam"
msgstr "- Take photos and videos from your webcam"
-#: ../src/cheese-main.vala:86
+#: ../src/cheese-main.vala:78
#, c-format
msgid "Run '%s --help' to see a full list of available command line options.\n"
msgstr ""
"Run '%s --help' to see a full list of available command line options.\n"
-#: ../src/cheese-window.vala:604
+#: ../src/cheese-window.vala:642
msgid "Stop _Recording"
msgstr "×?_פסקת ×?×?ק×?×?×?"
-#: ../src/cheese-window.vala:723
+#: ../src/cheese-window.vala:761
msgid "No effects found"
msgstr "×?×? × ×?צ×?×? ×?פק×?×?×?"
+#~ msgid "Be verbose"
+#~ msgstr "Be verbose"
+
#~ msgid "Historical"
#~ msgstr "×?×?ס×?×?ר×?"
diff --git a/po/hu.po b/po/hu.po
index 93a2e9a..5a949a2 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: cheese master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-03 23:40+0100\n"
-"PO-Revision-Date: 2010-03-03 23:40+0100\n"
+"POT-Creation-Date: 2010-08-26 03:16+0200\n"
+"PO-Revision-Date: 2010-08-26 03:15+0200\n"
"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
"Language-Team: Hungarian <gnome at fsf dot hu>\n"
"MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:113
+#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:118
msgid "Cheese"
msgstr "CsÃÃz"
@@ -140,14 +140,18 @@ msgid "Set to True to show countdown when taking a photo"
msgstr "Ã?llÃtsa igazra, ha visszaszámlálást szeretne a fénykép készÃtése elÅ?tt"
#: ../data/cheese.schemas.in.h:23
+msgid "Set to True to use flash when taking a photo"
+msgstr "Ã?llÃtsa igazra, ha vakut szeretne használni a fénykép készÃtése elÅ?tt"
+
+#: ../data/cheese.schemas.in.h:24
msgid "The device which points to the camera (e.g. /dev/video0)"
msgstr "A kamerára mutató eszköz (például /dev/video0)"
-#: ../data/cheese.schemas.in.h:24
+#: ../data/cheese.schemas.in.h:25
msgid "The height resolution of the image captured from the camera"
msgstr "A kameráról kapott kép magassága"
-#: ../data/cheese.schemas.in.h:25
+#: ../data/cheese.schemas.in.h:26
msgid ""
"The length of time, in milliseconds, to delay between taking each photo in a "
"burst sequence of photos."
@@ -155,31 +159,35 @@ msgstr ""
"Az egyes fényképek készÃtése közti késleltetés ezredmásodpercben a "
"fényképsorozat készÃtésekor."
-#: ../data/cheese.schemas.in.h:26
+#: ../data/cheese.schemas.in.h:27
msgid "The number of photos to take in a single burst."
msgstr "Egy sorozatban készÃtendÅ? fényképek száma."
-#: ../data/cheese.schemas.in.h:27
+#: ../data/cheese.schemas.in.h:28
msgid "The width resolution of the image captured from the camera"
msgstr "A kameráról kapott kép szélessége"
-#: ../data/cheese.schemas.in.h:28
+#: ../data/cheese.schemas.in.h:29
msgid "Use a countdown"
msgstr "�nkioldó"
-#: ../data/cheese.schemas.in.h:29
+#: ../data/cheese.schemas.in.h:30
+msgid "Use a flash"
+msgstr "Vaku"
+
+#: ../data/cheese.schemas.in.h:31
msgid "Video Path"
msgstr "Videók mappája"
-#: ../data/cheese.schemas.in.h:30
+#: ../data/cheese.schemas.in.h:32
msgid "Whether to enable immediate deletion"
msgstr "Engedélyezze-e az azonnali törlést"
-#: ../data/cheese.schemas.in.h:31
+#: ../data/cheese.schemas.in.h:33
msgid "Whether to start in wide mode"
msgstr "Széles módban induljon-e?"
-#: ../data/cheese.schemas.in.h:32
+#: ../data/cheese.schemas.in.h:34
msgid "Width resolution"
msgstr "Szélesség"
@@ -199,7 +207,7 @@ msgstr "Váltás videó módba"
msgid "Switch to the Effects Selector"
msgstr "Váltás az effektusválasztóra"
-#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:57 ../src/cheese-window.c:869
+#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:61 ../src/cheese-window.c:884
msgid "_Effects"
msgstr "_Hatások"
@@ -207,7 +215,7 @@ msgstr "_Hatások"
msgid "_Leave Fullscreen"
msgstr "T_eljes képernyÅ? elhagyása"
-#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:68 ../src/cheese-window.c:59
+#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:72 ../src/cheese-window.c:59
msgid "_Take a Photo"
msgstr "Fény_képezés"
@@ -259,7 +267,7 @@ msgstr "TelÃtettség"
msgid "Webcam"
msgstr "Webkamera"
-#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:632
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:640
msgid "Shutter sound"
msgstr "Zárhang"
@@ -275,24 +283,24 @@ msgstr "Fény_képezés"
msgid "_Discard photo"
msgstr "_Fénykép eldobása"
-#: ../libcheese/cheese-camera-device.c:327
+#: ../libcheese/cheese-camera-device.c:328
msgid "Device capabilities not supported"
msgstr "Az eszköz képességei nem támogatottak"
-#: ../libcheese/cheese-camera-device.c:488
+#: ../libcheese/cheese-camera-device.c:510
msgid "Unknown device"
msgstr "Ismeretlen eszköz"
-#: ../libcheese/cheese-camera-device.c:512
+#: ../libcheese/cheese-camera-device.c:534
msgid "Cancellable initialization not supported"
msgstr "A megszakÃtható elÅ?készÃtés nem támogatott"
-#: ../libcheese/cheese-camera.c:1134
+#: ../libcheese/cheese-camera.c:1139
#, c-format
msgid "No device found"
msgstr "Nem található eszköz"
-#: ../libcheese/cheese-camera.c:1153
+#: ../libcheese/cheese-camera.c:1158
msgid "One or more needed GStreamer elements are missing: "
msgstr "Legalább egy szükséges GStreamer elem hiányzik: "
@@ -302,8 +310,8 @@ msgstr "Legalább egy szükséges GStreamer elem hiányzik: "
#. * To enable to show the numbers in your own language, use %Id instead.
#. * Please leave the additional whitespace after the number
#.
-#: ../libcheese/cheese-countdown.c:436 ../libcheese/cheese-countdown.c:455
-#: ../libcheese/cheese-countdown.c:474
+#: ../libcheese/cheese-countdown.c:441 ../libcheese/cheese-countdown.c:460
+#: ../libcheese/cheese-countdown.c:479
#, c-format
msgid "%d "
msgstr "%d "
@@ -389,7 +397,7 @@ msgstr "Valóban szeretné áthelyezni az összes fényképet és videót a Kuk
msgid "_Move to Trash"
msgstr "�_thelyezés a Kukába"
-#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:654
+#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:662
msgid "Unable to open help file for Cheese"
msgstr "A CsÃÃz súgóját nem lehet megnyitni"
@@ -483,7 +491,7 @@ msgstr "GörbÃtés"
msgid "No camera found!"
msgstr "Nincs elérhetÅ? kamera!"
-#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1219
+#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1258
msgid "Please refer to the help for further information."
msgstr "További információt a súgóban találhat."
@@ -523,35 +531,39 @@ msgstr "S_orozat"
msgid "Countdown"
msgstr "Visszaszámlálás"
-#: ../src/cheese-ui.h:64
+#: ../src/cheese-ui.h:57
+msgid "Flash"
+msgstr "Vaku"
+
+#: ../src/cheese-ui.h:68
msgid "_Wide mode"
msgstr "S_zéles mód"
-#: ../src/cheese-ui.h:71
+#: ../src/cheese-ui.h:75
msgid "_Recording"
msgstr "_Felvétel"
-#: ../src/cheese-ui.h:74 ../src/cheese-window.c:62
+#: ../src/cheese-ui.h:78 ../src/cheese-window.c:62
msgid "_Take multiple Photos"
msgstr "_Több fénykép készÃtése"
-#: ../src/cheese-ui.h:78
+#: ../src/cheese-ui.h:82
msgid "_Open"
msgstr "Me_gnyitás"
-#: ../src/cheese-ui.h:80
+#: ../src/cheese-ui.h:84
msgid "Save _Asâ?¦"
msgstr "Men_tés másként�"
-#: ../src/cheese-ui.h:82
+#: ../src/cheese-ui.h:86
msgid "Move to _Trash"
msgstr "�t_helyezés a Kukába"
-#: ../src/cheese-ui.h:84
+#: ../src/cheese-ui.h:88
msgid "Delete"
msgstr "Törlés"
-#: ../src/cheese-ui.h:89
+#: ../src/cheese-ui.h:93
msgid "Move All to Trash"
msgstr "�sszes áthelyezése a Kukába"
@@ -563,18 +575,18 @@ msgstr "Fe_lvétel indÃtása"
msgid "_Stop Recording"
msgstr "Felvétel _megállÃtása"
-#: ../src/cheese.c:96
+#: ../src/cheese.c:97
msgid "Be verbose"
msgstr "Részletes kimenet"
-#: ../src/cheese.c:98
+#: ../src/cheese.c:99
msgid "Enable wide mode"
msgstr "Széles mód bekapcsolása"
-#: ../src/cheese.c:100
+#: ../src/cheese.c:101
msgid "output version information and exit"
msgstr "Verzióinformációk kiÃrása és kilépés"
-#: ../src/cheese.c:115
+#: ../src/cheese.c:120
msgid "- Take photos and videos with your webcam, with fun graphical effects"
msgstr "â?? Képek és videók felvétele webkamerával, vicces grafikai hatásokkal"
diff --git a/po/id.po b/po/id.po
index 9683bfd..78110e7 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,6 +1,5 @@
-# translation of cheese.master.po to Indonesian
-# Indonesian translation of Cheese
-# Copyright (C) 2010 THE cheese'S COPYRIGHT HOLDER
+# translation of cheese master to Indonesian
+# Copyright (C) 2010 THE Cheese'S COPYRIGHT HOLDER
# This file is distributed under the same license as the Cheese package.
#
# Andika Triwidada <andika gmail com>, 2010.
@@ -10,9 +9,9 @@ msgstr ""
"Project-Id-Version: cheese.master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
"product=cheese&component=general\n"
-"POT-Creation-Date: 2010-08-04 03:19+0000\n"
-"PO-Revision-Date: 2010-08-04 12:57+0700\n"
-"Last-Translator: Andika Triwidada <andika gmail com>\n"
+"POT-Creation-Date: 2010-08-29 19:34+0000\n"
+"PO-Revision-Date: 2010-08-27 13:31+0700\n"
+"Last-Translator: Dirgita <dirgitadevina yahoo co id>\n"
"Language-Team: GNOME Indonesian Translation Team <gnome i15n org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,10 +19,10 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Poedit-Language: Indonesian\n"
"X-Poedit-Country: Indonesia\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.1\n"
#: ../data/cheese-about.ui.h:1 ../data/cheese.desktop.in.in.h:1
-#: ../src/cheese-main.vala:105
+#: ../src/cheese-main.vala:102
msgid "Cheese"
msgstr "Cheese"
@@ -34,7 +33,7 @@ msgstr "Situs Web Cheese"
#: ../data/cheese-about.ui.h:3 ../data/cheese.desktop.in.in.h:3
msgid "Take photos and videos with your webcam, with fun graphical effects"
msgstr ""
-"Ambil foto dan video dengan webcam Anda, dengan efek grafis yang menarik"
+"Ambil foto dan video dengan webkam Anda, dengan efek grafis yang menarik"
#: ../data/cheese-about.ui.h:4
msgid ""
@@ -60,9 +59,8 @@ msgstr ""
"ADANYA JAMINAN; termasuk tanpa jaminan DAYA JUAL atau KELAIKAN UNTUK TUJUAN "
"TERTENTU. Lihat GNU General Public License untuk rincian lebih lanjut.\n"
"\n"
-"\n"
"Anda seharusnya menerima salinan dari GNU General Public License bersama "
-"dengan program ini. Bila tidak, lihat http://www.gnu.org/licenses/\n";
+"program ini. Jika tidak, lihatlah http://www.gnu.org/licenses/\n";
#: ../data/cheese-about.ui.h:10
msgid "translator-credits"
@@ -76,7 +74,7 @@ msgstr "Rentetan"
#: ../data/cheese-actions.ui.h:2
msgid "Fullscreen"
-msgstr "Layar penuh"
+msgstr "Layar Penuh"
#: ../data/cheese-actions.ui.h:3
msgid "Help _Contents"
@@ -104,7 +102,7 @@ msgstr "Simp_an Sebagai"
#: ../data/cheese-actions.ui.h:9
msgid "Take _Multiple Photos"
-msgstr "A_mbil Foto Berganda"
+msgstr "A_mbil Banyak Foto"
#: ../data/cheese-actions.ui.h:10
msgid "_About"
@@ -148,7 +146,7 @@ msgstr "_Keluar"
#: ../data/cheese-actions.ui.h:20
msgid "_Record a Video"
-msgstr "_Rekam suatu Video"
+msgstr "_Rekam Video"
#: ../data/cheese-actions.ui.h:21 ../data/cheese-main-window.ui.h:3
msgid "_Take a Photo"
@@ -160,7 +158,7 @@ msgstr "_Video"
#: ../data/cheese-actions.ui.h:23
msgid "_Wide Mode"
-msgstr "Moda _Lebar"
+msgstr "Mode _Lebar"
#: ../data/cheese-main-window.ui.h:2
msgid "_Leave Fullscreen"
@@ -212,11 +210,11 @@ msgstr "Saturasi"
#: ../data/cheese-prefs.ui.h:12
msgid "Webcam"
-msgstr "Webcam"
+msgstr "Webkam"
#: ../data/cheese.desktop.in.in.h:2
msgid "Cheese Webcam Booth"
-msgstr "Kios Webcam Cheese"
+msgstr "Cheese Pojok Webkam"
#. Translators: please note, that the effect names are
#. standarized and should not be translated
@@ -268,7 +266,7 @@ msgstr ""
#: ../data/cheese.schemas.in.h:11
msgid "Height resolution"
-msgstr "Resolusi ketinggian"
+msgstr "Resolusi tinggi"
#: ../data/cheese.schemas.in.h:12
msgid ""
@@ -294,11 +292,11 @@ msgstr "Milidetik antar foto pada moda rentetan."
#: ../data/cheese.schemas.in.h:15
msgid "Number of photos in burst mode."
-msgstr "Cacah foto pada moda rentetan."
+msgstr "Banyaknya foto dalam mode rentetan."
#: ../data/cheese.schemas.in.h:16
msgid "Photo Path"
-msgstr "Path Foto"
+msgstr "Lokasi Foto"
#: ../data/cheese.schemas.in.h:17
msgid "Picture brightness"
@@ -310,7 +308,7 @@ msgstr "Kontras gambar"
#: ../data/cheese.schemas.in.h:19
msgid "Picture hue"
-msgstr "Hue gambar"
+msgstr "Corak gambar"
#: ../data/cheese.schemas.in.h:20
msgid "Picture saturation"
@@ -350,11 +348,11 @@ msgstr "Resolusi lebar dari citra yang ditangkap dari kamera"
#: ../data/cheese.schemas.in.h:28
msgid "Use a countdown"
-msgstr "Gunakan hitung mundur"
+msgstr "Menggunakan hitung mundur"
#: ../data/cheese.schemas.in.h:29
msgid "Video Path"
-msgstr "Path Video"
+msgstr "Lokasi Video"
#: ../data/cheese.schemas.in.h:30
msgid "Whether to enable immediate deletion"
@@ -368,45 +366,45 @@ msgstr "Apakah mulai pada moda lebar"
msgid "Width resolution"
msgstr "Resolusi lebar"
-#: ../libcheese/cheese-avatar-chooser.c:110
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.vala:594
msgid "Shutter sound"
msgstr "Suara tombol"
-#: ../libcheese/cheese-avatar-chooser.c:236
+#: ../libcheese/cheese-avatar-chooser.c:238
msgid "Take a photo"
msgstr "Ambil foto"
-#: ../libcheese/cheese-avatar-chooser.c:255
+#: ../libcheese/cheese-avatar-chooser.c:257
msgid "_Take a photo"
msgstr "Ambil fo_to"
-#: ../libcheese/cheese-avatar-chooser.c:270
+#: ../libcheese/cheese-avatar-chooser.c:272
msgid "_Discard photo"
msgstr "_Buang foto"
-#: ../libcheese/cheese-camera-device.c:328
+#: ../libcheese/cheese-camera-device.c:329
msgid "Device capabilities not supported"
msgstr "Kapabilitas perangkat tak didukung"
-#: ../libcheese/cheese-camera-device.c:352
+#: ../libcheese/cheese-camera-device.c:357
#, c-format
msgid "Failed to initialize device %s for capability probing"
-msgstr "Gagal menginisialisasi perangkat %s untuk pemeriksaan kapabilitas"
+msgstr "Gagal menginisialisasi perangkat %s untuk penetapan kapabilitas"
-#: ../libcheese/cheese-camera-device.c:510
+#: ../libcheese/cheese-camera-device.c:515
msgid "Unknown device"
msgstr "Perangkat tak dikenal"
-#: ../libcheese/cheese-camera-device.c:534
+#: ../libcheese/cheese-camera-device.c:539
msgid "Cancellable initialization not supported"
msgstr "Inisiasi yang dapat dibatalkan tak didukung"
-#: ../libcheese/cheese-camera.c:1128
+#: ../libcheese/cheese-camera.c:1156
#, c-format
msgid "No device found"
msgstr "Tidak menemukan perangkat"
-#: ../libcheese/cheese-camera.c:1147
+#: ../libcheese/cheese-camera.c:1175
msgid "One or more needed GStreamer elements are missing: "
msgstr "Satu atau lebih elemen GStreamer yang diperlukan hilang:"
@@ -422,33 +420,41 @@ msgstr "Satu atau lebih elemen GStreamer yang diperlukan hilang:"
msgid "%d "
msgstr "%d "
-#: ../src/cheese-main.vala:38
-msgid "Be verbose"
-msgstr "Mode riuh"
+#: ../src/cheese-effects-manager.vala:116
+msgid "No Effect"
+msgstr "Tanpa Efek"
-#: ../src/cheese-main.vala:39
+#: ../src/cheese-main.vala:37
msgid "Enable wide mode"
msgstr "Mengaktifkan mode lebar"
-#: ../src/cheese-main.vala:40
+#: ../src/cheese-main.vala:38
+msgid "Device to use as a camera"
+msgstr "Perangkat yang akan dipakai sebagai kamera"
+
+#: ../src/cheese-main.vala:38
+msgid "DEVICE"
+msgstr "PERANGKAT"
+
+#: ../src/cheese-main.vala:39
msgid "Output version information and exit"
-msgstr "Tampilkan informasi versi dan keluar"
+msgstr "Menampilkan informasi versi dan keluar"
-#: ../src/cheese-main.vala:75
+#: ../src/cheese-main.vala:66
msgid "- Take photos and videos from your webcam"
-msgstr "- Ambil foto dan video dengan webcam Anda"
+msgstr "- Mengambil foto dan video dengan webkam Anda"
-#: ../src/cheese-main.vala:86
+#: ../src/cheese-main.vala:77
#, c-format
msgid "Run '%s --help' to see a full list of available command line options.\n"
msgstr ""
-"Jalankan '%s --help' untuk melihat daftar lengkap dari opsi perintah baris "
-"yang tersedia.\n"
+"Jalankan '%s --help' untuk daftar lengkap opsi baris perintah yang "
+"tersedia.\n"
-#: ../src/cheese-window.vala:604
+#: ../src/cheese-window.vala:689
msgid "Stop _Recording"
msgstr "Berhenti Me_rekam"
-#: ../src/cheese-window.vala:723
+#: ../src/cheese-window.vala:821
msgid "No effects found"
msgstr "Tidak menemukan efek"
diff --git a/po/it.po b/po/it.po
index 92ef38d..4a7f235 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,5 +1,6 @@
# Cheese Italian translation
-# Copyright (C) 2007 the cheese copyright holder # This file is distributed under the same license as cheese
+# Copyright (C) 2007, 2008, 2009, 2010 the cheese copyright holder
+# This file is distributed under the same license as cheese
#
# Alessandro Falappa <alessandro falappa net>, 2007,2008,2009,2010.
msgid ""
@@ -7,8 +8,8 @@ msgstr ""
"Project-Id-Version: cheese\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
"product=cheese&component=general\n"
-"POT-Creation-Date: 2010-03-03 22:40+0000\n"
-"PO-Revision-Date: 2010-03-03 21:45+0200\n"
+"POT-Creation-Date: 2010-08-26 01:17+0000\n"
+"PO-Revision-Date: 2010-08-26 21:45+0200\n"
"Last-Translator: Alessandro Falappa <alessandro falappa net>\n"
"Language-Team: Italian <tp lists linux it>\n"
"MIME-Version: 1.0\n"
@@ -16,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:113
+#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:118
msgid "Cheese"
msgstr "Cheese"
@@ -43,30 +44,25 @@ msgstr ""
"flip\", \"shagadelic\", \"vertigo\", \"edge\", \"dice\" e \"warp\""
#: ../data/cheese.schemas.in.h:4
-#| msgid "Adjusts brightness level of the picture coming from the webcam"
msgid "Adjusts brightness level of the picture coming from the camera"
msgstr ""
"Regola il livello di luminosità dell'immagine catturata dalla videocamera"
#: ../data/cheese.schemas.in.h:5
-#| msgid "Adjusts contrast level of the picture coming from the webcam"
msgid "Adjusts contrast level of the picture coming from the camera"
msgstr ""
"Regola il livello di contrasto dell'immagine catturata dalla videocamera"
#: ../data/cheese.schemas.in.h:6
-#| msgid "Adjusts hue level of the picture coming from the webcam"
msgid "Adjusts hue level of the picture coming from the camera"
msgstr "Regola la tonalità di colore dell'immagine catturata dalla videocamera"
#: ../data/cheese.schemas.in.h:7
-#| msgid "Adjusts saturation level of the picture coming from the webcam"
msgid "Adjusts saturation level of the picture coming from the camera"
msgstr ""
"Regola il livello di saturazione dell'immagine catturata dalla videocamera"
#: ../data/cheese.schemas.in.h:8
-#| msgid "Webcam device string indicator"
msgid "Camera device string indicator"
msgstr "Device della videocamera"
@@ -91,9 +87,6 @@ msgid "Height resolution"
msgstr "Risoluzione verticale"
#: ../data/cheese.schemas.in.h:12
-#| msgid ""
-#| "If set to true, Cheese will startup in a wide mode with the image "
-#| "collection placed on the right side. Useful with small screens."
msgid ""
"If set to true, Cheese will start up in a wide mode with the image "
"collection placed on the right-hand side. Useful with small screens."
@@ -150,46 +143,54 @@ msgstr ""
"Se impostato a VERO, viene mostrato un conto alla rovescia prima dello scatto"
#: ../data/cheese.schemas.in.h:23
-#| msgid "The device which points to the webcam (e.g. /dev/video0)"
+#| msgid "Set to True to show countdown when taking a photo"
+msgid "Set to True to use flash when taking a photo"
+msgstr "Se impostato a VERO, utilizza il flash durante lo scatto"
+
+#: ../data/cheese.schemas.in.h:24
msgid "The device which points to the camera (e.g. /dev/video0)"
msgstr "Device che punta alla videocamera (per esempio /dev/video0)"
-#: ../data/cheese.schemas.in.h:24
+#: ../data/cheese.schemas.in.h:25
msgid "The height resolution of the image captured from the camera"
msgstr "La risoluzione verticale dell'immagine catturata dalla videocamera"
-#: ../data/cheese.schemas.in.h:25
+#: ../data/cheese.schemas.in.h:26
msgid ""
"The length of time, in milliseconds, to delay between taking each photo in a "
"burst sequence of photos."
msgstr ""
"L'intervallo di tempo tra una foto e l'altra in una raffica, in millisecondi."
-#: ../data/cheese.schemas.in.h:26
+#: ../data/cheese.schemas.in.h:27
msgid "The number of photos to take in a single burst."
msgstr "Il numero di foto da riprendere in una singola raffica."
-#: ../data/cheese.schemas.in.h:27
+#: ../data/cheese.schemas.in.h:28
msgid "The width resolution of the image captured from the camera"
msgstr "La risoluzione orizzontale dell'immagine catturata dalla videocamera"
-#: ../data/cheese.schemas.in.h:28
+#: ../data/cheese.schemas.in.h:29
msgid "Use a countdown"
msgstr "Usa un conto alla rovescia"
-#: ../data/cheese.schemas.in.h:29
+#: ../data/cheese.schemas.in.h:30
+msgid "Use a flash"
+msgstr "Utilizza il flash"
+
+#: ../data/cheese.schemas.in.h:31
msgid "Video Path"
msgstr "Percorso video"
-#: ../data/cheese.schemas.in.h:30
+#: ../data/cheese.schemas.in.h:32
msgid "Whether to enable immediate deletion"
msgstr "Indica se abilitare l'eliminazione immediata"
-#: ../data/cheese.schemas.in.h:31
+#: ../data/cheese.schemas.in.h:33
msgid "Whether to start in wide mode"
msgstr "Indica se iniziare in modalità panoramica"
-#: ../data/cheese.schemas.in.h:32
+#: ../data/cheese.schemas.in.h:34
msgid "Width resolution"
msgstr "Risoluzione orizzontale"
@@ -209,7 +210,7 @@ msgstr "Passa alla modalità video"
msgid "Switch to the Effects Selector"
msgstr "Passa al selettore degli effetti"
-#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:57 ../src/cheese-window.c:869
+#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:61 ../src/cheese-window.c:884
msgid "_Effects"
msgstr "_Effetti"
@@ -217,7 +218,7 @@ msgstr "_Effetti"
msgid "_Leave Fullscreen"
msgstr "_Finestra normale"
-#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:68 ../src/cheese-window.c:59
+#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:72 ../src/cheese-window.c:59
msgid "_Take a Photo"
msgstr "_Scatta foto"
@@ -234,7 +235,6 @@ msgid "Contrast"
msgstr "Contrasto"
#: ../data/cheese-prefs.ui.h:4
-#| msgid "Delay between photos (secs.)"
msgid "Delay between photos (seconds)"
msgstr "Intervallo tra le foto (secondi)"
@@ -270,12 +270,11 @@ msgstr "Saturazione"
msgid "Webcam"
msgstr "Webcam"
-#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:632
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:640
msgid "Shutter sound"
msgstr "Suono dell'otturatore"
#: ../libcheese/cheese-avatar-chooser.c:236
-#| msgid "_Take a photo"
msgid "Take a photo"
msgstr "Scatta una foto"
@@ -287,26 +286,24 @@ msgstr "_Scatta foto"
msgid "_Discard photo"
msgstr "_Scarta foto"
-#: ../libcheese/cheese-camera-device.c:327
+#: ../libcheese/cheese-camera-device.c:328
msgid "Device capabilities not supported"
msgstr "Funzionalità del dispositivo non supportate"
-#: ../libcheese/cheese-camera-device.c:488
+#: ../libcheese/cheese-camera-device.c:510
msgid "Unknown device"
msgstr "Dispositivo sconosciuto"
-#: ../libcheese/cheese-camera-device.c:512
+#: ../libcheese/cheese-camera-device.c:534
msgid "Cancellable initialization not supported"
msgstr "Interruzione del processo di inizializzazione non supportata"
-#: ../libcheese/cheese-camera.c:1134
+#: ../libcheese/cheese-camera.c:1139
#, c-format
-#| msgid "No camera found!"
msgid "No device found"
msgstr "Nessun dispositivo trovato"
-#: ../libcheese/cheese-camera.c:1153
-#| msgid "One or more needed gstreamer elements are missing: "
+#: ../libcheese/cheese-camera.c:1158
msgid "One or more needed GStreamer elements are missing: "
msgstr "Uno o più elementi GStreamer risultano mancanti: "
@@ -316,8 +313,8 @@ msgstr "Uno o più elementi GStreamer risultano mancanti: "
#. * To enable to show the numbers in your own language, use %Id instead.
#. * Please leave the additional whitespace after the number
#.
-#: ../libcheese/cheese-countdown.c:436 ../libcheese/cheese-countdown.c:455
-#: ../libcheese/cheese-countdown.c:474
+#: ../libcheese/cheese-countdown.c:441 ../libcheese/cheese-countdown.c:460
+#: ../libcheese/cheese-countdown.c:479
#, c-format
msgid "%d "
msgstr "%d "
@@ -403,7 +400,7 @@ msgstr "Spostare tutte le foto e i video nel cestino?"
msgid "_Move to Trash"
msgstr "_Sposta nel cestino"
-#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:654
+#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:662
msgid "Unable to open help file for Cheese"
msgstr "Impossibile aprire il file della guida di Cheese"
@@ -496,7 +493,7 @@ msgstr "Distorsione"
msgid "No camera found!"
msgstr "Nessuna videocamera trovata."
-#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1219
+#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1258
msgid "Please refer to the help for further information."
msgstr "Per ulteriori informazioni, consultare il manuale."
@@ -536,36 +533,39 @@ msgstr "_Raffica"
msgid "Countdown"
msgstr "Conto alla rovescia"
-#: ../src/cheese-ui.h:64
+#: ../src/cheese-ui.h:57
+msgid "Flash"
+msgstr "Flash"
+
+#: ../src/cheese-ui.h:68
msgid "_Wide mode"
msgstr "Modalità _panoramica"
-#: ../src/cheese-ui.h:71
+#: ../src/cheese-ui.h:75
msgid "_Recording"
msgstr "_Registrazione"
-#: ../src/cheese-ui.h:74 ../src/cheese-window.c:62
+#: ../src/cheese-ui.h:78 ../src/cheese-window.c:62
msgid "_Take multiple Photos"
msgstr "_Scatta foto a raffica"
-#: ../src/cheese-ui.h:78
+#: ../src/cheese-ui.h:82
msgid "_Open"
msgstr "_Apri"
-#: ../src/cheese-ui.h:80
-#| msgid "Save _As..."
+#: ../src/cheese-ui.h:84
msgid "Save _Asâ?¦"
msgstr "Sa_lva come..."
-#: ../src/cheese-ui.h:82
+#: ../src/cheese-ui.h:86
msgid "Move to _Trash"
msgstr "Sposta nel ce_stino"
-#: ../src/cheese-ui.h:84
+#: ../src/cheese-ui.h:88
msgid "Delete"
msgstr "Elimina"
-#: ../src/cheese-ui.h:89
+#: ../src/cheese-ui.h:93
msgid "Move All to Trash"
msgstr "Sposta tutto nel cestino"
@@ -577,19 +577,19 @@ msgstr "Inizia _registrazione"
msgid "_Stop Recording"
msgstr "Ferma _registrazione"
-#: ../src/cheese.c:96
+#: ../src/cheese.c:97
msgid "Be verbose"
msgstr "Maggiore dettaglio nei messaggi"
-#: ../src/cheese.c:98
+#: ../src/cheese.c:99
msgid "Enable wide mode"
msgstr "Abilita la modalità panoramica"
-#: ../src/cheese.c:100
+#: ../src/cheese.c:101
msgid "output version information and exit"
msgstr "Mostra informazioni di versione ed esce"
-#: ../src/cheese.c:115
+#: ../src/cheese.c:120
msgid "- Take photos and videos with your webcam, with fun graphical effects"
msgstr ""
"- Scatta fotografie e registra video con la webcam applicando divertenti "
diff --git a/po/ja.po b/po/ja.po
index bfd290b..58d0b11 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,33 +4,220 @@
# Takeshi AIHANA <takeshi aihana gmail com>, 2007,2008.
# Kentaro Kazuhama <kazken3 gmail com>, 2009.
# Hideki Yamane (Debian-JP) <henrich debian or jp>, 2009-2010.
+# Takayuki KUSANO <AE5T-KSN asahi-net or jp>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: cheese master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
"product=cheese&component=general\n"
-"POT-Creation-Date: 2010-03-29 21:22+0000\n"
-"PO-Revision-Date: 2010-02-23 23:14+0900\n"
-"Last-Translator: Hideki Yamane (Debian-JP) <henrich debian or jp>\n"
+"POT-Creation-Date: 2010-11-03 08:54+0000\n"
+"PO-Revision-Date: 2010-09-13 22:31+0900\n"
+"Last-Translator: Takayuki KUSANO <AE5T-KSN asahi-net or jp>\n"
"Language-Team: Japanese <gnome-translation gnome gr jp>\n"
+"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:118
+#: ../data/cheese-about.ui.h:1 ../data/cheese.desktop.in.in.h:1
+#: ../src/cheese-main.vala:102
msgid "Cheese"
msgstr "Cheese"
-#: ../data/cheese.desktop.in.in.h:2
-msgid "Cheese Webcam Booth"
-msgstr "Cheese ã?¦ã?§ã??ã?«ã? ã?»ã??ã?¼ã?¹"
+#: ../data/cheese-about.ui.h:2
+msgid "Cheese Website"
+msgstr "Cheese ã?®ã?¦ã?§ã??ã?µã?¤ã??"
-#: ../data/cheese.desktop.in.in.h:3 ../src/cheese-commands-help.c:118
+#: ../data/cheese-about.ui.h:3 ../data/cheese.desktop.in.in.h:3
msgid "Take photos and videos with your webcam, with fun graphical effects"
msgstr "ã?¦ã?§ã??ã?«ã? ã?§ç?»å??å?¹æ??ã??ä»?ä¸?ã??ã??楽ã??ã??å??ç??ã??å??ç?»ã??æ?®ã??ã?¾ã??"
+#: ../data/cheese-about.ui.h:4
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see http://www.gnu.org/licenses/\n";
+msgstr ""
+
+#: ../data/cheese-about.ui.h:10
+msgid "translator-credits"
+msgstr ""
+"�� � <takeshi aihana gmail com>\n"
+"kentaro kazuhama <kazken3 gmail com>\n"
+"ã??ã?¾ã?ã?²ã?§ã?? <henrich debian or jp>\n"
+"è??é?? è²´ä¹? <AE5T-KSN asahi-net or jp>\n"
+"��GNOME����� <http://www.gnome.gr.jp/>"
+
+#: ../data/cheese-actions.ui.h:1
+#, fuzzy
+msgid "Burst"
+msgstr "��(_B)"
+
+#: ../data/cheese-actions.ui.h:2
+#, fuzzy
+msgid "Fullscreen"
+msgstr "ã??ã?«ã?¹ã?¯ã?ªã?¼ã?³ã?®è§£é?¤(_L)"
+
+#: ../data/cheese-actions.ui.h:3
+#, fuzzy
+msgid "Help _Contents"
+msgstr "�次(_C)"
+
+#: ../data/cheese-actions.ui.h:4
+msgid "Move All to Trash"
+msgstr "ã??ã?¹ã?¦ã?´ã??ç®±ã?¸ç§»å??ã??ã??"
+
+#: ../data/cheese-actions.ui.h:5
+msgid "Move to _Trash"
+msgstr "ã?´ã??ç®±ã?¸ç§»å??ã??ã??(_T)"
+
+#: ../data/cheese-actions.ui.h:6
+#, fuzzy
+msgid "Next Effects"
+msgstr "å?¹æ??ã?ªã??"
+
+#: ../data/cheese-actions.ui.h:7
+#, fuzzy
+msgid "Previous Effects"
+msgstr "å?¹æ??ã?ªã??"
+
+#: ../data/cheese-actions.ui.h:8
+#, fuzzy
+msgid "Save _As"
+msgstr "å?¥å??ã?§ä¿?å?(_A)â?¦"
+
+#: ../data/cheese-actions.ui.h:9
+#, fuzzy
+msgid "Take _Multiple Photos"
+msgstr "è¤?æ?°ã?®å??ç??ã??æ?®ã??(_T)"
+
+#: ../data/cheese-actions.ui.h:10
+msgid "_About"
+msgstr ""
+
+#: ../data/cheese-actions.ui.h:11
+msgid "_Cheese"
+msgstr "Cheese(_C)"
+
+#: ../data/cheese-actions.ui.h:12
+#, fuzzy
+msgid "_Delete"
+msgstr "å??é?¤"
+
+#: ../data/cheese-actions.ui.h:13
+msgid "_Edit"
+msgstr "ç·¨é??(_E)"
+
+#: ../data/cheese-actions.ui.h:14 ../data/cheese-main-window.ui.h:1
+msgid "_Effects"
+msgstr "ç?»å??ã?®å?¹æ??(_E)"
+
+#: ../data/cheese-actions.ui.h:15
+msgid "_Help"
+msgstr "ã??ã?«ã??(_H)"
+
+#: ../data/cheese-actions.ui.h:16
+msgid "_Open"
+msgstr "é??ã??(_O)"
+
+#: ../data/cheese-actions.ui.h:17
+msgid "_Photo"
+msgstr "å??ç??(_P)"
+
+#: ../data/cheese-actions.ui.h:18
+#, fuzzy
+msgid "_Preferences"
+msgstr "Cheese ã?®è¨å®?"
+
+#: ../data/cheese-actions.ui.h:19
+msgid "_Quit"
+msgstr ""
+
+#: ../data/cheese-actions.ui.h:20
+#, fuzzy
+msgid "_Record a Video"
+msgstr "é?²ç?»ã??ã??(_R)"
+
+#: ../data/cheese-actions.ui.h:21 ../data/cheese-main-window.ui.h:3
+msgid "_Take a Photo"
+msgstr "å??ç??ã?®æ?®å½±(_T)"
+
+#: ../data/cheese-actions.ui.h:22
+msgid "_Video"
+msgstr "å??ç?»(_V)"
+
+#: ../data/cheese-actions.ui.h:23
+#, fuzzy
+msgid "_Wide Mode"
+msgstr "ã?¯ã?¤ã??ã?¢ã?¼ã??(_W)"
+
+#: ../data/cheese-main-window.ui.h:2
+msgid "_Leave Fullscreen"
+msgstr "ã??ã?«ã?¹ã?¯ã?ªã?¼ã?³ã?®è§£é?¤(_L)"
+
+#: ../data/cheese-prefs.ui.h:1
+msgid "Brightness"
+msgstr "æ??ã??ã??"
+
+#: ../data/cheese-prefs.ui.h:2
+msgid "Burst mode"
+msgstr "é?£ç¶?ã?¢ã?¼ã??"
+
+#: ../data/cheese-prefs.ui.h:3
+msgid "Contrast"
+msgstr "ã?³ã?³ã??ã?©ã?¹ã??"
+
+#: ../data/cheese-prefs.ui.h:4
+msgid "Delay between photos (seconds)"
+msgstr "ç?»å??表示ã?®é??延é??é??(ç§?)"
+
+#: ../data/cheese-prefs.ui.h:5
+msgid "Device"
+msgstr "ã??ã??ã?¤ã?¹"
+
+#: ../data/cheese-prefs.ui.h:6
+msgid "Hue"
+msgstr "��"
+
+#: ../data/cheese-prefs.ui.h:7
+msgid "Image properties"
+msgstr "ç?»å??ã?®ã??ã?ã??ã??ã?£"
+
+#: ../data/cheese-prefs.ui.h:8
+msgid "Number of photos"
+msgstr "ç?»å??ã?®æ?°"
+
+#: ../data/cheese-prefs.ui.h:9
+msgid "Preferences"
+msgstr "Cheese ã?®è¨å®?"
+
+#: ../data/cheese-prefs.ui.h:10
+msgid "Resolution"
+msgstr "解å??度"
+
+#: ../data/cheese-prefs.ui.h:11
+msgid "Saturation"
+msgstr "é®®ã??ã??"
+
+#: ../data/cheese-prefs.ui.h:12
+msgid "Webcam"
+msgstr "ã?¦ã?§ã??ã?«ã? "
+
+#: ../data/cheese.desktop.in.in.h:2
+msgid "Cheese Webcam Booth"
+msgstr "Cheese ã?¦ã?§ã??ã?«ã? ã?»ã??ã?¼ã?¹"
+
#. Translators: please note, that the effect names are
#. standarized and should not be translated
#: ../data/cheese.schemas.in.h:3
@@ -39,11 +226,11 @@ msgid ""
"\"noir_blanc\", \"saturation\", \"hulk\", \"vertical-flip\", \"horizontal-"
"flip\", \"shagadelic\", \"vertigo\", \"edge\", \"dice\" and \"warp\""
msgstr ""
-"èµ·å??æ??ã?«é?©ç?¨ã??ã??ã??ã??ã??ã??ã?ªç?»å??å?¹æ??ã?§ã??ã??æ??å®?å?¯è?½ã?ªå?¤: \"mauve\" (è??ç´«è?²)ã??"
-"\"noir_blanc\" (ç?½é»?)ã??\"saturation\" (é®®ã??ã??)ã??\"hulk\" (ã??ã?«ã?¯)ã??"
-"\"vertical-flip\" (Ｙ軸æ?¹å??ã?«æ??ã??è¿?ã??)ã?? \"horizontal-flip\" (Ｘ軸æ?¹å??ã?«æ??ã??"
-"è¿?ã??)ã??\"shagadelic\" (ã?»ã?¯ã?·ã?¼)ã??\"vertigo\" (ã??ã?¾ã??)ã??\"edge\" (ã?¨ã??ã?¸)ã??"
-"\"dice\" (ã??ã?¤ã?¹)ã??\"warp\" (ã?¯ã?¼ã??)"
+"èµ·å??æ??ã?«é?©ç?¨ã??ã??ã??ã??ã??ã??ã?ªç?»å??å?¹æ??ã?§ã??ã??æ??å®?å?¯è?½ã?ªå?¤: \"mauve\" (è??ç´«"
+"è?²)ã??\"noir_blanc\" (ç?½é»?)ã??\"saturation\" (é®®ã??ã??)ã??\"hulk\" (ã??ã?«"
+"ã?¯)ã??\"vertical-flip\" (Y軸æ?¹å??ã?«æ??ã??è¿?ã??)ã?? \"horizontal-flip\" (X軸æ?¹å??ã?«æ??"
+"ã??è¿?ã??)ã??\"shagadelic\" (ã?»ã?¯ã?·ã?¼)ã??\"vertigo\" (ã??ã?¾ã??)ã??\"edge\" (ã?¨ã??"
+"ã?¸)ã??\"dice\" (ã??ã?¤ã?¹)ã??\"warp\" (ã?¯ã?¼ã??)"
#: ../data/cheese.schemas.in.h:4
msgid "Adjusts brightness level of the picture coming from the camera"
@@ -83,7 +270,7 @@ msgstr ""
#: ../data/cheese.schemas.in.h:11
msgid "Height resolution"
-msgstr "ï¼¹æ?¹å??ã?®è§£å??度"
+msgstr "Yæ?¹å??ã?®è§£å??度"
#: ../data/cheese.schemas.in.h:12
msgid ""
@@ -100,7 +287,7 @@ msgid ""
"feature can be dangerous, so use caution."
msgstr ""
"TRUE ã?«ã??ã??ã?¨ã?´ã??ç®±ã?«é??ã??ã??ã?¨ã?ªã??ã?«ã??ã?®å ´ã?§ã??ã?¡ã?¤ã?«ã??æ?¹æ¶?ã??ã?¾ã??ã??æ?¹æ¶?ã??ã??ã?¨å??"
-"ã?«æ?»ã??ã?ªã??ã?®ã?§ã??ã??ã?®æ©?è?½ã?®æ?±ã??ã?«ã?¯å??å??ã?«æ³¨æ??ã??ã?¦ä¸?ã??ã??ã??"
+"ã?«æ?»ã??ã?ªã??ã?®ã?§ã??ã??ã?®æ©?è?½ã?®æ?±ã??ã?«ã?¯å??å??ã?«æ³¨æ??ã??ã?¦ã??ã? ã??ã??ã??"
#: ../data/cheese.schemas.in.h:14
msgid "Milliseconds between photos in burst mode."
@@ -144,7 +331,7 @@ msgstr "ã?«ã?¡ã?©ã??æ?¥ç¶?ã??ã?¦ã??ã??ã??ã??ã?¤ã?¹å??ã?§ã?? (ä¾?: /dev/video0)"
#: ../data/cheese.schemas.in.h:24
msgid "The height resolution of the image captured from the camera"
-msgstr "ã?«ã?¡ã?©ã?§å??å¾?ã??ã??ç?»å??ã?®é«?ã?? (ï¼¹æ?¹å??ã?®è§£å??度) ã?§ã??ã??"
+msgstr "ã?«ã?¡ã?©ã?§å??å¾?ã??ã??ç?»å??ã?®é«?ã?? (Yæ?¹å??ã?®è§£å??度) ã?§ã??ã??"
#: ../data/cheese.schemas.in.h:25
msgid ""
@@ -158,7 +345,7 @@ msgstr "ä¸?度ã?®é?£ç¶?ã?¢ã?¼ã??ã?§æ?®å½±ã??ã??ç?»å??ã?®æ?°ã??è¨å®?ã??ã?¾ã??ã??
#: ../data/cheese.schemas.in.h:27
msgid "The width resolution of the image captured from the camera"
-msgstr "ã?«ã?¡ã?©ã?§å??å¾?ã??ã??ç?»å??ã?®å¹? (Ｘæ?¹å??ã?®è§£å??度) ã?§ã??ã??"
+msgstr "ã?«ã?¡ã?©ã?§å??å¾?ã??ã??ç?»å??ã?®å¹? (Xæ?¹å??ã?®è§£å??度) ã?§ã??ã??"
#: ../data/cheese.schemas.in.h:28
msgid "Use a countdown"
@@ -178,120 +365,49 @@ msgstr "ã?¯ã?¤ã??ã?¢ã?¼ã??ã?§é??å§?ã??ã??ã??ã?©ã??ã??"
#: ../data/cheese.schemas.in.h:32
msgid "Width resolution"
-msgstr "Ｘæ?¹å??ã?®è§£å??度"
-
-#: ../data/cheese.ui.h:1
-msgid "Switch to Burst Mode"
-msgstr "é?£ç¶?ã?¢ã?¼ã??ã?«å??ã??æ?¿ã??"
-
-#: ../data/cheese.ui.h:2
-msgid "Switch to Photo Mode"
-msgstr "å??ç??ã?®ã?¢ã?¼ã??ã?«å??ã??æ?¿ã??ã?¾ã??"
-
-#: ../data/cheese.ui.h:3
-msgid "Switch to Video Mode"
-msgstr "å??ç?»ã?®ã?¢ã?¼ã??ã?«å??ã??æ?¿ã??ã?¾ã??"
-
-#: ../data/cheese.ui.h:4
-msgid "Switch to the Effects Selector"
-msgstr "ç?»å??ã?®å?¹æ??ã??é?¸æ??ã??ã??ã?¢ã?¼ã??ã?«å??ã??æ?¿ã??ã?¾ã??"
-
-#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:57 ../src/cheese-window.c:869
-msgid "_Effects"
-msgstr "ç?»å??ã?®å?¹æ??(_E)"
-
-#: ../data/cheese.ui.h:6
-msgid "_Leave Fullscreen"
-msgstr "ã??ã?«ã?¹ã?¯ã?ªã?¼ã?³è¡¨ç¤ºã?®è§£é?¤(_L)"
-
-#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:68 ../src/cheese-window.c:59
-msgid "_Take a Photo"
-msgstr "å??ç??ã?®æ?®å½±(_T)"
-
-#: ../data/cheese-prefs.ui.h:1
-msgid "Brightness"
-msgstr "æ??ã??ã??"
-
-#: ../data/cheese-prefs.ui.h:2
-msgid "Burst mode"
-msgstr "é?£ç¶?ã?¢ã?¼ã??"
-
-#: ../data/cheese-prefs.ui.h:3
-msgid "Contrast"
-msgstr "ã?³ã?³ã??ã?©ã?¹ã??"
+msgstr "Xæ?¹å??ã?®è§£å??度"
-#: ../data/cheese-prefs.ui.h:4
-msgid "Delay between photos (seconds)"
-msgstr "ç?»å??表示ã?®é??延é??é??(ç§?)"
-
-#: ../data/cheese-prefs.ui.h:5
-msgid "Device"
-msgstr "ã??ã??ã?¤ã?¹"
-
-#: ../data/cheese-prefs.ui.h:6
-msgid "Hue"
-msgstr "��"
-
-#: ../data/cheese-prefs.ui.h:7
-msgid "Image properties"
-msgstr "ç?»å??ã?®ã??ã?ã??ã??ã?£"
-
-#: ../data/cheese-prefs.ui.h:8
-msgid "Number of photos"
-msgstr "ç?»å??ã?®æ?°"
-
-#: ../data/cheese-prefs.ui.h:9 ../src/cheese-ui.h:44
-msgid "Preferences"
-msgstr "Cheese ã?®è¨å®?"
-
-#: ../data/cheese-prefs.ui.h:10
-msgid "Resolution"
-msgstr "解å??度"
-
-#: ../data/cheese-prefs.ui.h:11 ../src/cheese-effect-chooser.c:66
-msgid "Saturation"
-msgstr "é®®ã??ã??"
-
-#: ../data/cheese-prefs.ui.h:12
-msgid "Webcam"
-msgstr "ã?¦ã?§ã??ã?«ã? "
-
-#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:632
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.vala:593
msgid "Shutter sound"
msgstr "ã?·ã?£ã??ã?¿ã?¼é?³"
-#: ../libcheese/cheese-avatar-chooser.c:236
+#: ../libcheese/cheese-avatar-chooser.c:238
msgid "Take a photo"
msgstr "å??ç??ã??æ?®ã??"
-#: ../libcheese/cheese-avatar-chooser.c:255
+#: ../libcheese/cheese-avatar-chooser.c:257
msgid "_Take a photo"
msgstr "å??ç??ã??æ?®ã??(_T)"
-#: ../libcheese/cheese-avatar-chooser.c:270
+#: ../libcheese/cheese-avatar-chooser.c:272
msgid "_Discard photo"
msgstr "å??ç??ã??ç ´æ£?ã??ã??(_D)"
-#: ../libcheese/cheese-camera-device.c:327
+#: ../libcheese/cheese-camera-device.c:329
msgid "Device capabilities not supported"
msgstr "ã??ã??ã?¤ã?¹ã?®æ©?è?½ã?¯ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã?¾ã??ã??"
-#: ../libcheese/cheese-camera-device.c:488
+#: ../libcheese/cheese-camera-device.c:357
+#, c-format
+msgid "Failed to initialize device %s for capability probing"
+msgstr ""
+
+#: ../libcheese/cheese-camera-device.c:515
msgid "Unknown device"
msgstr "ä¸?æ??ã?ªã??ã??ã?¤ã?¹"
-#: ../libcheese/cheese-camera-device.c:512
+#: ../libcheese/cheese-camera-device.c:539
msgid "Cancellable initialization not supported"
msgstr "å??æ??å??ã?¯ã?ã?£ã?³ã?»ã?«ã?§ã??ã?¾ã??ã??"
-#: ../libcheese/cheese-camera.c:1134
+#: ../libcheese/cheese-camera.c:1156
#, c-format
msgid "No device found"
msgstr "ã??ã??ã?¤ã?¹ã??è¦?ã?¤ã??ã??ã?¾ã??ã??"
-#: ../libcheese/cheese-camera.c:1153
+#: ../libcheese/cheese-camera.c:1175
msgid "One or more needed GStreamer elements are missing: "
-msgstr "å¿?è¦?ã?ª GStreamer ã?¨ã?¬ã?¡ã?³ã??ã??è¦?ã?¤ã??ã??ã?¾ã??ã??:"
+msgstr "å¿?è¦?ã?ª GStreamer ã?¨ã?¬ã?¡ã?³ã??ã??è¦?ã?¤ã??ã??ã?¾ã??ã??: "
#. TRANSLATORS:
#. * This is the countdown number when taking the photo.
@@ -299,281 +415,210 @@ msgstr "å¿?è¦?ã?ª GStreamer ã?¨ã?¬ã?¡ã?³ã??ã??è¦?ã?¤ã??ã??ã?¾ã??ã??:"
#. * To enable to show the numbers in your own language, use %Id instead.
#. * Please leave the additional whitespace after the number
#.
-#: ../libcheese/cheese-countdown.c:436 ../libcheese/cheese-countdown.c:455
-#: ../libcheese/cheese-countdown.c:474
+#: ../libcheese/cheese-countdown.c:441 ../libcheese/cheese-countdown.c:460
+#: ../libcheese/cheese-countdown.c:479
#, c-format
msgid "%d "
msgstr "%d "
-#: ../src/cheese-commands-file.c:31
-msgid "_Skip"
-msgstr "ã?¹ã?ã??ã??(_S)"
-
-#: ../src/cheese-commands-file.c:32
-msgid "S_kip All"
-msgstr "å?¨ã?¦ã?¹ã?ã??ã??(_K)"
+#: ../src/cheese-effects-manager.vala:116
+msgid "No Effect"
+msgstr "å?¹æ??ã?ªã??"
-#: ../src/cheese-commands-file.c:33
-msgid "Delete _All"
-msgstr "å?¨ã?¦å??é?¤(_A)"
+#: ../src/cheese-main.vala:37
+msgid "Enable wide mode"
+msgstr "ã?¯ã?¤ã??ã?¢ã?¼ã??ã??æ??å?¹ã?«ã??ã??"
-#: ../src/cheese-commands-file.c:57
-#, c-format
-msgid ""
-"Failed to launch program to show:\n"
-"%s\n"
-"%s"
+#: ../src/cheese-main.vala:38
+msgid "Device to use as a camera"
msgstr ""
-"表示ã??ã?ã?°ã?©ã? ã?®èµ·å??ã?«å¤±æ??ã??ã?¾ã??ã??:\n"
-"%s\n"
-"%s"
-
-#: ../src/cheese-commands-file.c:78
-msgid "Save File"
-msgstr "ã??ã?¡ã?¤ã?«ã?®ä¿?å?"
-
-#: ../src/cheese-commands-file.c:116
-#, c-format
-msgid "Could not save %s"
-msgstr "%s ã??ä¿?å?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
-
-#: ../src/cheese-commands-file.c:139
-msgid "Error while deleting"
-msgstr "å??é?¤ã??ã??é??ã?«ã?¨ã?©ã?¼"
-#: ../src/cheese-commands-file.c:140
-#, c-format
-msgid "The file \"%s\" cannot be deleted. Details: %s"
-msgstr "\"%s\" ã?¨ã??ã??ã??ã?¡ã?¤ã?«ã??å??é?¤ã?§ã??ã?¾ã??ã??ã??詳細ã?¯æ¬¡ã?®ã?¨ã??ã??ã?§ã??: %s"
-
-#: ../src/cheese-commands-file.c:167
-#, c-format
-msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural ""
-"Are you sure you want to permanently delete the %'d selected items?"
-msgstr[0] "æ?¬å½?ã?«æ??å®?ã??ã?? %'då??ã?®ã?¢ã?¤ã??ã? ã??å®?å?¨ã?«æ?¹æ¶?ã??ã?¦ã??ã??ã??ã??ã??ã?§ã??ã??ï¼?"
-
-#: ../src/cheese-commands-file.c:174
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\"?"
-msgstr "\"%s\" ã??å®?å?¨ã?«æ?¹æ¶?ã??ã?¦ã??ã??ã??ã??ã??ã?§ã??ã??ï¼?"
-
-#: ../src/cheese-commands-file.c:177
-#, c-format
-msgid "If you delete an item, it will be permanently lost."
-msgstr "ã??ã?®ã?¢ã?¤ã??ã? ã??å??é?¤ã??ã??ã?¨å??ã?«æ?»ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??ã??ã??"
+#: ../src/cheese-main.vala:38
+msgid "DEVICE"
+msgstr ""
-#: ../src/cheese-commands-file.c:198
-msgid "Unknown Error"
-msgstr "å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼"
+#: ../src/cheese-main.vala:39
+#, fuzzy
+msgid "Output version information and exit"
+msgstr "ã??ã?¼ã?¸ã?§ã?³æ??å ±ã??å?ºå??ã??ã?¦çµ?äº?ã??ã??"
-#: ../src/cheese-commands-file.c:228
-msgid "Cannot move file to trash, do you want to delete immediately?"
-msgstr "ã??ã?¡ã?¤ã?«ã??ã?´ã??ç®±ã?¸ç§»å??ã?§ã??ã?¾ã??ã??ã??ä»?ã??ã??å??é?¤ã??ã?¦ã??ã??ã??ã??ã??ã?§ã??ã??ï¼?"
+#: ../src/cheese-main.vala:66
+#, fuzzy
+msgid "- Take photos and videos from your webcam"
+msgstr "- ã?¦ã?§ã??ã?«ã? ã?§ç?»å??å?¹æ??ã??ä»?ã??ã??楽ã??ã??å??ç??ã??å??ç?»ã??æ?®ã??"
-#: ../src/cheese-commands-file.c:229
+#: ../src/cheese-main.vala:77
#, c-format
-msgid "The file \"%s\" cannot be moved to the trash. Details: %s"
+msgid "Run '%s --help' to see a full list of available command line options.\n"
msgstr ""
-"\"%s\" ã?¨ã??ã??ã??ã?¡ã?¤ã?«ã??ã?´ã??ç®±ã?¸ç§»å??ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??詳細ã?¯æ¬¡ã?®ã?¨ã??ã??ã?§ã??: %s"
-#: ../src/cheese-commands-file.c:301
-#, c-format
-msgid "Really move all photos and videos to the trash?"
-msgstr "æ?¬å½?ã?«å?¨ã?¦ã?®å??ç??ã?¨å??ç?»ã??ã?´ã??ç®±ã?«ç§»å??ã??ã?¾ã??ã??ï¼?"
+#: ../src/cheese-window.vala:688
+#, fuzzy
+msgid "Stop _Recording"
+msgstr "é?²ç?»ã?®å??æ¢(_S)"
-#: ../src/cheese-commands-file.c:309
-msgid "_Move to Trash"
-msgstr "ã?´ã??ç®±ã?¸ç§»å??ã??ã??(_M)"
+#: ../src/cheese-window.vala:820
+#, fuzzy
+msgid "No effects found"
+msgstr "ã??ã??ã?¤ã?¹ã??è¦?ã?¤ã??ã??ã?¾ã??ã??"
-#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:654
-msgid "Unable to open help file for Cheese"
-msgstr "Cheese ã?®ã??ã?«ã??ã??é??ã??ã?¾ã??ã??ã?§ã??ã??"
+#~ msgid "Set to True to use flash when taking a photo"
+#~ msgstr "å??ç??ã??æ?®ã??æ??ã?«ã??ã?©ã??ã?·ã?¥ã??使ã??ã?«ã?¯ true ã?¨è¨å®?ã??ã?¾ã??"
-#: ../src/cheese-commands-help.c:96
-msgid "translator-credits"
-msgstr ""
-"�� � <takeshi aihana gmail com>\n"
-"kentaro kazuhama <kazken3 gmail com>\n"
-"ã??ã?¾ã?ã?²ã?§ã?? <henrich debian or jp>"
+#~ msgid "Use a flash"
+#~ msgstr "ã??ã?©ã??ã?·ã?¥ã??使ç?¨"
-#: ../src/cheese-commands-help.c:99
-msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-msgstr ""
-"ã??ã?®ã??ã?ã?°ã?©ã? ã?¯ã??ã?ªã?¼ã?½ã??ã??ã?¦ã?§ã?¢ã?§ã??ã??ã??ã?ªã??ã?¡ã??ã??ã?ªã?¼ã?½ã??ã??ã?¦ã?§ã?¢è²¡å?£ã??æ??"
-"ä¾?ã??ã?? GNU ä¸?è?¬å?¬æ??使ç?¨è¨±è«¾å¥?ç´?æ?¸ã?®ç¬¬äº?ç??ã??ã??ã??ã??ã?¯ã??ã??以é??ã?®ç??ã??å®?ã??ã??æ?¡é ?ã?®"
-"ä¸?ã?§æ?¬ã??ã?ã?°ã?©ã? ã??å??é ?å¸?ã?¾ã??ã?¯å¤?æ?´ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??\n"
+#~ msgid "Switch to Burst Mode"
+#~ msgstr "é?£ç¶?ã?¢ã?¼ã??ã?«å??ã??æ?¿ã??"
-#: ../src/cheese-commands-help.c:103
-msgid ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-msgstr ""
-"æ?¬ã??ã?ã?°ã?©ã? ã?¯æ??ç?¨ã?¨ã?¯æ??ã??ã?¾ã??ã??ã??é ?å¸?ã?«ã??ã??ã?£ã?¦ã?¯å¸?å ´æ?§å??ã?³ç?¹å®?ç?®ç??ã??é?©å??æ?§"
-"ã?«ã?¤ã??ã?¦ã?®æ??é»?ã?®ä¿?証ã??å?«ã??ã?¦ã??ã??ã??ã?ªã??ä¿?証ã??è¡?ã?ªã??ã?¾ã??ã??ã??詳細ã?«ã?¤ã??ã?¦ã?¯ GNU "
-"ä¸?è?¬å?¬æ??使ç?¨è¨±è«¾å¥?ç´?æ?¸ã??ã??覧ä¸?ã??ã??ã??\n"
+#~ msgid "Switch to Photo Mode"
+#~ msgstr "å??ç??ã?®ã?¢ã?¼ã??ã?«å??ã??æ?¿ã??ã?¾ã??"
-#: ../src/cheese-commands-help.c:107
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr ""
-"ã??ã?ªã??ã?¯æ?¬ã??ã?ã?°ã?©ã? ã?¨ä¸?ç·?ã?« GNU ä¸?è?¬å?¬æ??使ç?¨è¨±è«¾å¥?ç´?æ?¸ã?®å??ã??ã??å??ã??å??ã?£ã?¦ã??ã??"
-"ã?¯ã??ã?§ã??ã??ã??ã??ã?§ã?ªã??å ´å??ã?¯ <http://www.gnu.org/licenses/> ã??ã??覧ä¸?ã??ã??ã??"
+#~ msgid "Switch to Video Mode"
+#~ msgstr "å??ç?»ã?®ã?¢ã?¼ã??ã?«å??ã??æ?¿ã??ã?¾ã??"
-#: ../src/cheese-commands-help.c:124
-msgid "Cheese Website"
-msgstr "Cheese ã?®ã?¦ã?§ã??ã?µã?¤ã??"
+#~ msgid "Switch to the Effects Selector"
+#~ msgstr "ç?»å??ã?®å?¹æ??ã??é?¸æ??ã??ã??ã?¢ã?¼ã??ã?«å??ã??æ?¿ã??ã?¾ã??"
-#: ../src/cheese-effect-chooser.c:60
-msgid "No Effect"
-msgstr "å?¹æ??ã?ªã??"
+#~ msgid "_Skip"
+#~ msgstr "ã?¹ã?ã??ã??(_S)"
-#: ../src/cheese-effect-chooser.c:62
-msgid "Mauve"
-msgstr "è??ç´«è?²"
+#~ msgid "S_kip All"
+#~ msgstr "ã??ã?¹ã?¦ã?¹ã?ã??ã??(_K)"
-#: ../src/cheese-effect-chooser.c:64
-msgid "Noir/Blanc"
-msgstr "��"
+#~ msgid "Delete _All"
+#~ msgstr "ã??ã?¹ã?¦å??é?¤(_A)"
-#: ../src/cheese-effect-chooser.c:68
-msgid "Hulk"
-msgstr "ã??ã?«ã?¯"
+#~ msgid ""
+#~ "Failed to launch program to show:\n"
+#~ "%s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "表示ã??ã?ã?°ã?©ã? ã?®èµ·å??ã?«å¤±æ??ã??ã?¾ã??ã??:\n"
+#~ "%s\n"
+#~ "%s"
-#: ../src/cheese-effect-chooser.c:70
-msgid "Vertical Flip"
-msgstr "Ｙ軸æ?¹å??ã?«æ??ã??è¿?ã??"
+#~ msgid "Save File"
+#~ msgstr "ã??ã?¡ã?¤ã?«ã?®ä¿?å?"
-#: ../src/cheese-effect-chooser.c:72
-msgid "Horizontal Flip"
-msgstr "Ｘ軸æ?¹å??ã?«æ??ã??è¿?ã??"
+#~ msgid "Could not save %s"
+#~ msgstr "%s ã??ä¿?å?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
-#: ../src/cheese-effect-chooser.c:74
-msgid "Shagadelic"
-msgstr "����"
+#~ msgid "Error while deleting"
+#~ msgstr "å??é?¤ã??ã??é??ã?«ã?¨ã?©ã?¼"
-#: ../src/cheese-effect-chooser.c:76
-msgid "Vertigo"
-msgstr "ã??ã?¾ã??"
+#~ msgid "The file \"%s\" cannot be deleted. Details: %s"
+#~ msgstr "\"%s\" ã?¨ã??ã??ã??ã?¡ã?¤ã?«ã??å??é?¤ã?§ã??ã?¾ã??ã??ã??詳細ã?¯æ¬¡ã?®ã?¨ã??ã??ã?§ã??: %s"
-#: ../src/cheese-effect-chooser.c:78
-msgid "Edge"
-msgstr "ã?¨ã??ã?¸"
+#~ msgid "Are you sure you want to permanently delete the %'d selected item?"
+#~ msgid_plural ""
+#~ "Are you sure you want to permanently delete the %'d selected items?"
+#~ msgstr[0] "æ?¬å½?ã?«æ??å®?ã??ã?? %'då??ã?®ã?¢ã?¤ã??ã? ã??å®?å?¨ã?«æ?¹æ¶?ã??ã?¦ã??ã??ã??ã??ã??ã?§ã??ã???"
-#: ../src/cheese-effect-chooser.c:80
-msgid "Dice"
-msgstr "ã??ã?¤ã?¹"
+#~ msgid "Are you sure you want to permanently delete \"%s\"?"
+#~ msgstr "\"%s\" ã??å®?å?¨ã?«æ?¹æ¶?ã??ã?¦ã??ã??ã??ã??ã??ã?§ã??ã???"
-#: ../src/cheese-effect-chooser.c:82
-msgid "Warp"
-msgstr "ã?¯ã?¼ã??"
+#~ msgid "If you delete an item, it will be permanently lost."
+#~ msgstr "ã??ã?®ã?¢ã?¤ã??ã? ã??å??é?¤ã??ã??ã?¨å??ã?«æ?»ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??ã??ã??"
-#: ../src/cheese-no-camera.c:94
-msgid "No camera found!"
-msgstr "ã?«ã?¡ã?©ã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã??ï¼?"
+#~ msgid "Unknown Error"
+#~ msgstr "å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼"
-#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1219
-msgid "Please refer to the help for further information."
-msgstr "æ?´ã?«è©³ç´°ã?ªæ??å ±ã?«ã?¤ã??ã?¦ã?¯ã??ã?«ã??ã??å??ç?§ã??ã?¦ä¸?ã??ã??ã??"
+#~ msgid "Cannot move file to trash, do you want to delete immediately?"
+#~ msgstr "ã??ã?¡ã?¤ã?«ã??ã?´ã??ç®±ã?¸ç§»å??ã?§ã??ã?¾ã??ã??ã??ä»?ã??ã??å??é?¤ã??ã?¦ã??ã??ã??ã??ã??ã?§ã??ã???"
-#: ../src/cheese-ui.h:32
-msgid "_Cheese"
-msgstr "Cheese(_C)"
+#~ msgid "The file \"%s\" cannot be moved to the trash. Details: %s"
+#~ msgstr ""
+#~ "\"%s\" ã?¨ã??ã??ã??ã?¡ã?¤ã?«ã??ã?´ã??ç®±ã?¸ç§»å??ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??詳細ã?¯æ¬¡ã?®ã?¨ã??ã??ã?§"
+#~ "ã??: %s"
-#: ../src/cheese-ui.h:34
-msgid "_Edit"
-msgstr "ç·¨é??(_E)"
+#~ msgid "Really move all photos and videos to the trash?"
+#~ msgstr "æ?¬å½?ã?«ã??ã?¹ã?¦ã?®å??ç??ã?¨å??ç?»ã??ã?´ã??ç®±ã?«ç§»å??ã??ã?¾ã??ã???"
-#: ../src/cheese-ui.h:35
-msgid "_Help"
-msgstr "ã??ã?«ã??(_H)"
+#~ msgid "_Move to Trash"
+#~ msgstr "ã?´ã??ç®±ã?¸ç§»å??ã??ã??(_M)"
-#: ../src/cheese-ui.h:38
-msgid "_Contents"
-msgstr "�次(_C)"
+#~ msgid "Unable to open help file for Cheese"
+#~ msgstr "Cheese ã?®ã??ã?«ã??ã??é??ã??ã?¾ã??ã??ã?§ã??ã??"
-#: ../src/cheese-ui.h:38
-msgid "Help on this Application"
-msgstr "ã??ã?®ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã?®ã??ã?«ã??ã?§ã??"
+#~ msgid ""
+#~ "This program is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ msgstr ""
+#~ "ã??ã?®ã??ã?ã?°ã?©ã? ã?¯ã??ã?ªã?¼ã?½ã??ã??ã?¦ã?§ã?¢ã?§ã??ã??ã??ã?ªã??ã?¡ã??ã??ã?ªã?¼ã?½ã??ã??ã?¦ã?§ã?¢è²¡å?£ã??"
+#~ "æ??ä¾?ã??ã?? GNU ä¸?è?¬å?¬æ??使ç?¨è¨±è«¾å¥?ç´?æ?¸ã?®ç¬¬äº?ç??ã??ã??ã??ã??ã?¯ã??ã??以é??ã?®ç??ã??å®?ã??ã??"
+#~ "æ?¡é ?ã?®ä¸?ã?§æ?¬ã??ã?ã?°ã?©ã? ã??å??é ?å¸?ã?¾ã??ã?¯å¤?æ?´ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??\n"
-#: ../src/cheese-ui.h:48
-msgid "_Photo"
-msgstr "å??ç??(_P)"
+#~ msgid ""
+#~ "This program is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General "
+#~ "Public License for more details.\n"
+#~ msgstr ""
+#~ "æ?¬ã??ã?ã?°ã?©ã? ã?¯æ??ç?¨ã?¨ã?¯æ??ã??ã?¾ã??ã??ã??é ?å¸?ã?«ã??ã??ã?£ã?¦ã?¯å¸?å ´æ?§å??ã?³ç?¹å®?ç?®ç??ã??é?©å??"
+#~ "æ?§ã?«ã?¤ã??ã?¦ã?®æ??é»?ã?®ä¿?証ã??å?«ã??ã?¦ã??ã??ã??ã?ªã??ä¿?証ã??è¡?ã?ªã??ã?¾ã??ã??ã??詳細ã?«ã?¤ã??ã?¦"
+#~ "ã?¯ GNU ä¸?è?¬å?¬æ??使ç?¨è¨±è«¾å¥?ç´?æ?¸ã??ã??覧ã??ã? ã??ã??ã??\n"
-#: ../src/cheese-ui.h:49
-msgid "_Video"
-msgstr "å??ç?»(_V)"
+#~ msgid ""
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with this program. If not, see <http://www.gnu.org/licenses/>."
+#~ msgstr ""
+#~ "ã??ã?ªã??ã?¯æ?¬ã??ã?ã?°ã?©ã? ã?¨ä¸?ç·?ã?« GNU ä¸?è?¬å?¬æ??使ç?¨è¨±è«¾å¥?ç´?æ?¸ã?®å??ã??ã??å??ã??å??ã?£ã?¦"
+#~ "ã??ã??ã?¯ã??ã?§ã??ã??ã??ã??ã?§ã?ªã??å ´å??ã?¯ <http://www.gnu.org/licenses/> ã??ã??覧ã??ã? ã??"
+#~ "ã??ã??"
-#: ../src/cheese-ui.h:50
-msgid "_Burst"
-msgstr "��(_B)"
+#~ msgid "Mauve"
+#~ msgstr "è??ç´«è?²"
-#: ../src/cheese-ui.h:54
-msgid "Countdown"
-msgstr "ã?«ã?¦ã?³ã??ã??ã?¦ã?³ã??ã??"
+#~ msgid "Noir/Blanc"
+#~ msgstr "��"
-#: ../src/cheese-ui.h:64
-msgid "_Wide mode"
-msgstr "ã?¯ã?¤ã??ã?¢ã?¼ã??(_W)"
+#~ msgid "Hulk"
+#~ msgstr "ã??ã?«ã?¯"
-#: ../src/cheese-ui.h:71
-msgid "_Recording"
-msgstr "é?²ç?»ã??ã??(_R)"
+#~ msgid "Vertical Flip"
+#~ msgstr "Y軸æ?¹å??ã?«æ??ã??è¿?ã??"
-#: ../src/cheese-ui.h:74 ../src/cheese-window.c:62
-msgid "_Take multiple Photos"
-msgstr "è¤?æ?°ã?®å??ç??ã??æ?®ã??(_T)"
+#~ msgid "Horizontal Flip"
+#~ msgstr "X軸æ?¹å??ã?«æ??ã??è¿?ã??"
-#: ../src/cheese-ui.h:78
-msgid "_Open"
-msgstr "é??ã??(_O)"
+#~ msgid "Shagadelic"
+#~ msgstr "����"
-#: ../src/cheese-ui.h:80
-msgid "Save _Asâ?¦"
-msgstr "å?¥å??ã?§ä¿?å?(_A)â?¦"
+#~ msgid "Vertigo"
+#~ msgstr "ã??ã?¾ã??"
-#: ../src/cheese-ui.h:82
-msgid "Move to _Trash"
-msgstr "ã?´ã??ç®±ã?¸ç§»å??ã??ã??(_T)"
+#~ msgid "Edge"
+#~ msgstr "ã?¨ã??ã?¸"
-#: ../src/cheese-ui.h:84
-msgid "Delete"
-msgstr "å??é?¤"
+#~ msgid "Dice"
+#~ msgstr "ã??ã?¤ã?¹"
-#: ../src/cheese-ui.h:89
-msgid "Move All to Trash"
-msgstr "å?¨ã?¦ã?´ã??ç®±ã?¸ç§»å??ã??ã??"
+#~ msgid "Warp"
+#~ msgstr "ã?¯ã?¼ã??"
-#: ../src/cheese-window.c:60
-msgid "_Start Recording"
-msgstr "é?²ç?»ã?®é??å§?(_S)"
+#~ msgid "No camera found!"
+#~ msgstr "ã?«ã?¡ã?©ã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã??!"
-#: ../src/cheese-window.c:61
-msgid "_Stop Recording"
-msgstr "é?²ç?»ã?®å??æ¢(_S)"
+#~ msgid "Please refer to the help for further information."
+#~ msgstr "æ?´ã?«è©³ç´°ã?ªæ??å ±ã?«ã?¤ã??ã?¦ã?¯ã??ã?«ã??ã??å??ç?§ã??ã?¦ã??ã? ã??ã??ã??"
-#: ../src/cheese.c:97
-msgid "Be verbose"
-msgstr "詳細ã?ªã?ã?°ã?«ã??ã??"
+#~ msgid "Help on this Application"
+#~ msgstr "ã??ã?®ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã?®ã??ã?«ã??ã?§ã??"
-#: ../src/cheese.c:99
-msgid "Enable wide mode"
-msgstr "ã?¯ã?¤ã??ã?¢ã?¼ã??ã??æ??å?¹ã?«ã??ã??"
+#~ msgid "Countdown"
+#~ msgstr "ã?«ã?¦ã?³ã??ã??ã?¦ã?³ã??ã??"
-#: ../src/cheese.c:101
-msgid "output version information and exit"
-msgstr "ã??ã?¼ã?¸ã?§ã?³æ??å ±ã??å?ºå??ã??ã?¦çµ?äº?ã??ã??"
+#~ msgid "Flash"
+#~ msgstr "ã??ã?©ã??ã?·ã?¥"
-#: ../src/cheese.c:120
-msgid "- Take photos and videos with your webcam, with fun graphical effects"
-msgstr "- ã?¦ã?§ã??ã?«ã? ã?§ç?»å??å?¹æ??ã??ä»?ã??ã??楽ã??ã??å??ç??ã??å??ç?»ã??æ?®ã??"
+#~ msgid "_Start Recording"
+#~ msgstr "é?²ç?»ã?®é??å§?(_S)"
+
+#~ msgid "Be verbose"
+#~ msgstr "詳細ã?ªã?ã?°ã?«ã??ã??"
#~ msgid "_Take another photo"
#~ msgstr "次ã?®å??ç??ã??æ?®ã??(_T)"
@@ -606,4 +651,4 @@ msgstr "- ã?¦ã?§ã??ã?«ã? ã?§ç?»å??å?¹æ??ã??ä»?ã??ã??楽ã??ã??å??ç??ã??å??ç?»ã??
#~ msgstr "é?²ç?»ã?®é??å§?(_S)"
#~ msgid "Check your GStreamer installation"
-#~ msgstr "GStreamer ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã?¦ã??ã??ã??確èª?ã??ã?¦ä¸?ã??ã??"
+#~ msgstr "GStreamer ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã?¦ã??ã??ã??確èª?ã??ã?¦ã??ã? ã??ã??"
diff --git a/po/kk.po b/po/kk.po
new file mode 100644
index 0000000..6cff21f
--- /dev/null
+++ b/po/kk.po
@@ -0,0 +1,551 @@
+# Kazakh translation of cheese.
+# Copyright (C) 2010 HZ
+# This file is distributed under the same license as the cheese package.
+# Baurzhan Muftakhidinov <baurthefirst gmail com>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=cheese&component=general\n";
+"POT-Creation-Date: 2010-08-18 20:24+0000\n"
+"PO-Revision-Date: 2010-09-15 16:05+0600\n"
+"Last-Translator: Baurzhan Muftakhidinov <baurthefirst gmail com>\n"
+"Language-Team: Kazakh <kk_KZ googlegroups com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"X-Poedit-Language: Kazakh\n"
+"X-Poedit-Country: KAZAKHSTAN\n"
+
+#: ../data/cheese.desktop.in.in.h:1
+#: ../src/cheese.c:118
+msgid "Cheese"
+msgstr "Cheese"
+
+#: ../data/cheese.desktop.in.in.h:2
+msgid "Cheese Webcam Booth"
+msgstr ""
+
+#: ../data/cheese.desktop.in.in.h:3
+#: ../src/cheese-commands-help.c:118
+msgid "Take photos and videos with your webcam, with fun graphical effects"
+msgstr ""
+
+#. Translators: please note, that the effect names are
+#. standarized and should not be translated
+#: ../data/cheese.schemas.in.h:3
+msgid "A list of effects applied on startup. Possible values are: \"mauve\", \"noir_blanc\", \"saturation\", \"hulk\", \"vertical-flip\", \"horizontal-flip\", \"shagadelic\", \"vertigo\", \"edge\", \"dice\" and \"warp\""
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:4
+msgid "Adjusts brightness level of the picture coming from the camera"
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:5
+msgid "Adjusts contrast level of the picture coming from the camera"
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:6
+msgid "Adjusts hue level of the picture coming from the camera"
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:7
+msgid "Adjusts saturation level of the picture coming from the camera"
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:8
+msgid "Camera device string indicator"
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:9
+msgid "Defines the path where the photos are stored, if empty \"XDG_PHOTO/Webcam\" will be used."
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:10
+msgid "Defines the path where the videos are stored, if empty \"XDG_VIDEO/Webcam\" will be used."
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:11
+msgid "Height resolution"
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:12
+msgid "If set to true, Cheese will start up in a wide mode with the image collection placed on the right-hand side. Useful with small screens."
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:13
+msgid "If set to true, then Cheese will have a feature allowing you to delete a file immediately and in-place, instead of moving it to the trash. This feature can be dangerous, so use caution."
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:14
+msgid "Milliseconds between photos in burst mode."
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:15
+msgid "Number of photos in burst mode."
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:16
+msgid "Photo Path"
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:17
+msgid "Picture brightness"
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:18
+msgid "Picture contrast"
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:19
+msgid "Picture hue"
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:20
+msgid "Picture saturation"
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:21
+msgid "Selected Effects"
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:22
+msgid "Set to True to show countdown when taking a photo"
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:23
+msgid "Set to True to use flash when taking a photo"
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:24
+msgid "The device which points to the camera (e.g. /dev/video0)"
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:25
+msgid "The height resolution of the image captured from the camera"
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:26
+msgid "The length of time, in milliseconds, to delay between taking each photo in a burst sequence of photos."
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:27
+msgid "The number of photos to take in a single burst."
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:28
+msgid "The width resolution of the image captured from the camera"
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:29
+msgid "Use a countdown"
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:30
+msgid "Use a flash"
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:31
+msgid "Video Path"
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:32
+msgid "Whether to enable immediate deletion"
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:33
+msgid "Whether to start in wide mode"
+msgstr ""
+
+#: ../data/cheese.schemas.in.h:34
+msgid "Width resolution"
+msgstr ""
+
+#: ../data/cheese.ui.h:1
+msgid "Switch to Burst Mode"
+msgstr ""
+
+#: ../data/cheese.ui.h:2
+msgid "Switch to Photo Mode"
+msgstr ""
+
+#: ../data/cheese.ui.h:3
+msgid "Switch to Video Mode"
+msgstr ""
+
+#: ../data/cheese.ui.h:4
+msgid "Switch to the Effects Selector"
+msgstr ""
+
+#: ../data/cheese.ui.h:5
+#: ../src/cheese-ui.h:61
+#: ../src/cheese-window.c:884
+msgid "_Effects"
+msgstr ""
+
+#: ../data/cheese.ui.h:6
+msgid "_Leave Fullscreen"
+msgstr "ТолÑ?Ò? _Ñ?кÑ?аннан Ñ?Ñ?Ò?Ñ?"
+
+#: ../data/cheese.ui.h:7
+#: ../src/cheese-ui.h:72
+#: ../src/cheese-window.c:59
+msgid "_Take a Photo"
+msgstr ""
+
+#: ../data/cheese-prefs.ui.h:1
+msgid "Brightness"
+msgstr "Ð?аÑ?Ñ?Ò?Ñ?Ñ?лÑ?Ò?Ñ?"
+
+#: ../data/cheese-prefs.ui.h:2
+msgid "Burst mode"
+msgstr ""
+
+#: ../data/cheese-prefs.ui.h:3
+msgid "Contrast"
+msgstr ""
+
+#: ../data/cheese-prefs.ui.h:4
+msgid "Delay between photos (seconds)"
+msgstr ""
+
+#: ../data/cheese-prefs.ui.h:5
+msgid "Device"
+msgstr "Ò?Ò±Ñ?Ñ?лÒ?Ñ?"
+
+#: ../data/cheese-prefs.ui.h:6
+msgid "Hue"
+msgstr "РеңÑ?"
+
+#: ../data/cheese-prefs.ui.h:7
+msgid "Image properties"
+msgstr "СÑ?Ñ?еÑ?Ñ?Ñ?Ò£ Ò?аÑ?иеÑ?Ñ?еÑ?Ñ?"
+
+#: ../data/cheese-prefs.ui.h:8
+msgid "Number of photos"
+msgstr ""
+
+#: ../data/cheese-prefs.ui.h:9
+#: ../src/cheese-ui.h:44
+msgid "Preferences"
+msgstr "Ò?алаÑ?лаÑ?"
+
+#: ../data/cheese-prefs.ui.h:10
+#, fuzzy
+msgid "Resolution"
+msgstr "Ð?жÑ?Ñ?аÑ?Ñ?лÑ?мдÑ?Ò?Ñ?"
+
+#: ../data/cheese-prefs.ui.h:11
+#: ../src/cheese-effect-chooser.c:66
+msgid "Saturation"
+msgstr "Ò?аңÑ?Ò?Ñ?Ñ?лÑ?Ò?Ñ?"
+
+#: ../data/cheese-prefs.ui.h:12
+msgid "Webcam"
+msgstr ""
+
+#: ../libcheese/cheese-avatar-chooser.c:110
+#: ../src/cheese-window.c:640
+msgid "Shutter sound"
+msgstr ""
+
+#: ../libcheese/cheese-avatar-chooser.c:236
+msgid "Take a photo"
+msgstr ""
+
+#: ../libcheese/cheese-avatar-chooser.c:255
+msgid "_Take a photo"
+msgstr ""
+
+#: ../libcheese/cheese-avatar-chooser.c:270
+msgid "_Discard photo"
+msgstr ""
+
+#: ../libcheese/cheese-camera-device.c:328
+msgid "Device capabilities not supported"
+msgstr ""
+
+#: ../libcheese/cheese-camera-device.c:510
+msgid "Unknown device"
+msgstr ""
+
+#: ../libcheese/cheese-camera-device.c:534
+msgid "Cancellable initialization not supported"
+msgstr ""
+
+#: ../libcheese/cheese-camera.c:1137
+#, c-format
+msgid "No device found"
+msgstr ""
+
+#: ../libcheese/cheese-camera.c:1156
+msgid "One or more needed GStreamer elements are missing: "
+msgstr ""
+
+#. TRANSLATORS:
+#. * This is the countdown number when taking the photo.
+#. * If you leave as is (that is, %d), it will show 3, 2, 1, 0.
+#. * To enable to show the numbers in your own language, use %Id instead.
+#. * Please leave the additional whitespace after the number
+#.
+#: ../libcheese/cheese-countdown.c:441
+#: ../libcheese/cheese-countdown.c:460
+#: ../libcheese/cheese-countdown.c:479
+#, c-format
+msgid "%d "
+msgstr ""
+
+#: ../src/cheese-commands-file.c:31
+msgid "_Skip"
+msgstr "Ð?_Ñ?Ñ?ап кеÑ?Ñ?"
+
+#: ../src/cheese-commands-file.c:32
+msgid "S_kip All"
+msgstr ""
+
+#: ../src/cheese-commands-file.c:33
+msgid "Delete _All"
+msgstr ""
+
+#: ../src/cheese-commands-file.c:57
+#, c-format
+msgid ""
+"Failed to launch program to show:\n"
+"%s\n"
+"%s"
+msgstr ""
+
+#: ../src/cheese-commands-file.c:78
+msgid "Save File"
+msgstr "ФайлдÑ? Ñ?аÒ?Ñ?аÑ?"
+
+#: ../src/cheese-commands-file.c:116
+#, c-format
+msgid "Could not save %s"
+msgstr "%s Ñ?аÒ?Ñ?аÑ? мүмкÑ?н емеÑ?"
+
+#: ../src/cheese-commands-file.c:139
+msgid "Error while deleting"
+msgstr "Ó¨Ñ?Ñ?Ñ?Ñ? Ò?аÑ?еÑ?Ñ?"
+
+#: ../src/cheese-commands-file.c:140
+#, c-format
+msgid "The file \"%s\" cannot be deleted. Details: %s"
+msgstr "\"%s\" Ñ?айлÑ?н Ó©Ñ?Ñ?Ñ?Ñ? мүмкÑ?н емеÑ?. СебебÑ?: %s"
+
+#: ../src/cheese-commands-file.c:167
+#, c-format
+msgid "Are you sure you want to permanently delete the %'d selected item?"
+msgid_plural "Are you sure you want to permanently delete the %'d selected items?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/cheese-commands-file.c:174
+#, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr ""
+
+#: ../src/cheese-commands-file.c:177
+#, c-format
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: ../src/cheese-commands-file.c:198
+msgid "Unknown Error"
+msgstr "Ð?елгÑ?Ñ?Ñ?з Ò?аÑ?е"
+
+#: ../src/cheese-commands-file.c:228
+msgid "Cannot move file to trash, do you want to delete immediately?"
+msgstr ""
+
+#: ../src/cheese-commands-file.c:229
+#, c-format
+msgid "The file \"%s\" cannot be moved to the trash. Details: %s"
+msgstr ""
+
+#: ../src/cheese-commands-file.c:301
+#, c-format
+msgid "Really move all photos and videos to the trash?"
+msgstr ""
+
+#: ../src/cheese-commands-file.c:309
+msgid "_Move to Trash"
+msgstr "Ò?оÒ?Ñ?_Ñ? Ñ?елегÑ?не Ñ?аÑ?Ñ?аÑ?"
+
+#: ../src/cheese-commands-help.c:39
+#: ../src/cheese-window.c:662
+msgid "Unable to open help file for Cheese"
+msgstr "Cheese Ò?олданбаÑ?Ñ? Ò¯Ñ?Ñ?н көмек Ñ?айлÑ?н аÑ?Ñ? мүмкÑ?н емеÑ?"
+
+#: ../src/cheese-commands-help.c:96
+msgid "translator-credits"
+msgstr "Baurzhan Muftakhidinov <baurthefirst gmail com>, 2010"
+
+#: ../src/cheese-commands-help.c:99
+msgid "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+msgstr "Ð?ұл - еÑ?кÑ?н баÒ?даÑ?лама; Ñ?Ñ?з онÑ? Free Software Foundation Ñ?Ñ?Ò?аÑ?Ò?ан GNU General Public License аÑ?Ñ?Ñ?нда еÑ?кÑ?н Ñ?аÑ?аÑ?а не/жÓ?не өзгеÑ?Ñ?е алаÑ?Ñ?з; лиÑ?ензиÑ? нұÑ?Ò?аÑ?Ñ? 2 не (Ñ?андаÑ?Ñ?Ò£Ñ?зÑ?а) кез-келген кейÑ?н Ñ?Ñ?Ò?Ò?ан.\n"
+
+#: ../src/cheese-commands-help.c:103
+msgid "This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+msgstr "Ð?ұл баÒ?даÑ?лама пайдалÑ? боладÑ? деген Ñ?енÑ?ммен Ñ?аÑ?аÑ?Ñ?ладÑ?, бÑ?Ñ?аÒ? Ð?ШÒ?Ð?Ð?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð? беÑ?Ñ?лмейдÑ?; Ð?Ð?Ð?Ð?Ð?РЦÐ?ЯÐ?ЫÒ? Ò?Ò°Ð?Ð?ЫÐ?ЫÒ? немеÑ?е белгÑ?лÑ? бÑ?Ñ? Ð?Ð?Ò?СÐ?ТТÐ?Ð Ò?Ð? СÓ?Ð?Ð?Ð?С Ð?Ð?Ð?Ð?ТÐ?Ð?Ð? Ò¯Ñ?Ñ?н де. Ð?өбÑ?Ñ?ек бÑ?лÑ? Ò¯Ñ?Ñ?н GNU General Public License Ò?аÑ?аңÑ?з.\n"
+
+#: ../src/cheese-commands-help.c:107
+msgid "You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#: ../src/cheese-commands-help.c:124
+msgid "Cheese Website"
+msgstr "Cheese веб Ñ?айÑ?Ñ?"
+
+#: ../src/cheese-effect-chooser.c:60
+msgid "No Effect"
+msgstr ""
+
+#: ../src/cheese-effect-chooser.c:62
+msgid "Mauve"
+msgstr ""
+
+#: ../src/cheese-effect-chooser.c:64
+msgid "Noir/Blanc"
+msgstr ""
+
+#: ../src/cheese-effect-chooser.c:68
+msgid "Hulk"
+msgstr ""
+
+#: ../src/cheese-effect-chooser.c:70
+msgid "Vertical Flip"
+msgstr "Ð?еÑ?Ñ?икалдÑ? аÑ?даÑ?Ñ?"
+
+#: ../src/cheese-effect-chooser.c:72
+msgid "Horizontal Flip"
+msgstr "Ð?оÑ?изонÑ?алдÑ? аÑ?даÑ?Ñ?"
+
+#: ../src/cheese-effect-chooser.c:74
+msgid "Shagadelic"
+msgstr ""
+
+#: ../src/cheese-effect-chooser.c:76
+msgid "Vertigo"
+msgstr ""
+
+#: ../src/cheese-effect-chooser.c:78
+msgid "Edge"
+msgstr ""
+
+#: ../src/cheese-effect-chooser.c:80
+msgid "Dice"
+msgstr ""
+
+#: ../src/cheese-effect-chooser.c:82
+msgid "Warp"
+msgstr ""
+
+#: ../src/cheese-no-camera.c:94
+msgid "No camera found!"
+msgstr "Ð?Ñ?бÑ?Ñ? камеÑ?а Ñ?абÑ?лмадÑ?!"
+
+#: ../src/cheese-no-camera.c:95
+#: ../src/cheese-window.c:1258
+msgid "Please refer to the help for further information."
+msgstr ""
+
+#: ../src/cheese-ui.h:32
+msgid "_Cheese"
+msgstr ""
+
+#: ../src/cheese-ui.h:34
+msgid "_Edit"
+msgstr "Тү_зеÑ?Ñ?"
+
+#: ../src/cheese-ui.h:35
+msgid "_Help"
+msgstr "_Ð?өмек"
+
+#: ../src/cheese-ui.h:38
+msgid "_Contents"
+msgstr "Ò?Ò±Ñ?а_маÑ?Ñ?"
+
+#: ../src/cheese-ui.h:38
+msgid "Help on this Application"
+msgstr "Ð?ұл Ò?олданба Ò¯Ñ?Ñ?н көмек аÒ?паÑ?аÑ?Ñ?"
+
+#: ../src/cheese-ui.h:48
+msgid "_Photo"
+msgstr "_ФоÑ?о"
+
+#: ../src/cheese-ui.h:49
+msgid "_Video"
+msgstr "Ð?_идео"
+
+#: ../src/cheese-ui.h:50
+msgid "_Burst"
+msgstr ""
+
+#: ../src/cheese-ui.h:54
+msgid "Countdown"
+msgstr ""
+
+#: ../src/cheese-ui.h:57
+#, fuzzy
+msgid "Flash"
+msgstr "Ð?аÑ?Ò?Ñ?лдаÑ?:"
+
+#: ../src/cheese-ui.h:68
+msgid "_Wide mode"
+msgstr ""
+
+#: ../src/cheese-ui.h:75
+msgid "_Recording"
+msgstr ""
+
+#: ../src/cheese-ui.h:78
+#: ../src/cheese-window.c:62
+msgid "_Take multiple Photos"
+msgstr ""
+
+#: ../src/cheese-ui.h:82
+msgid "_Open"
+msgstr "_Ð?Ñ?Ñ?"
+
+#: ../src/cheese-ui.h:84
+msgid "Save _Asâ?¦"
+msgstr "Ò?алайÑ?а Ñ?аÒ?_Ñ?аÑ?â?¦"
+
+#: ../src/cheese-ui.h:86
+msgid "Move to _Trash"
+msgstr "Ò?оÒ?Ñ?_Ñ? Ñ?елегÑ?не Ñ?аÑ?Ñ?аÑ?"
+
+#: ../src/cheese-ui.h:88
+msgid "Delete"
+msgstr "Ó¨Ñ?Ñ?Ñ?Ñ?"
+
+#: ../src/cheese-ui.h:93
+msgid "Move All to Trash"
+msgstr "Ð?аÑ?лÑ?Ò?Ñ?н Ò?оÒ?Ñ?Ñ? Ñ?елегÑ?не Ñ?аÑ?Ñ?аÑ?"
+
+#: ../src/cheese-window.c:60
+msgid "_Start Recording"
+msgstr ""
+
+#: ../src/cheese-window.c:61
+msgid "_Stop Recording"
+msgstr ""
+
+#: ../src/cheese.c:97
+msgid "Be verbose"
+msgstr "Ð?өбÑ?Ñ?ек аÒ?паÑ?аÑ?Ñ?Ñ? Ñ?Ñ?Ò?аÑ?Ñ?"
+
+#: ../src/cheese.c:99
+msgid "Enable wide mode"
+msgstr ""
+
+#: ../src/cheese.c:101
+msgid "output version information and exit"
+msgstr ""
+
+#: ../src/cheese.c:120
+msgid "- Take photos and videos with your webcam, with fun graphical effects"
+msgstr ""
+
diff --git a/po/lt.po b/po/lt.po
index a8fd30c..0bb2dd1 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -1,27 +1,29 @@
-# translation of lt.po to Lithuanian
# Cheese Lithuanian translation
-# Copyright (C) 2007 Gintautas Miliauskas <gintas akl lt>
+# Copyright © 2007 Gintautas Miliauskas <gintas akl lt>
+# Copyright © 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as cheese
+
# Gintautas Miliauskas <gintas akl lt>, 2008.
# Žygimantas BeruÄ?ka <zygis gnome org>, 2010.
+# Rimas Kudelis <rq akl lt>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: lt\n"
-"Report-Msgid-Bugs-To: "
-"http://bugzilla.gnome.org/enter_bug.cgi?product=cheese&component=general\n";
-"POT-Creation-Date: 2010-03-23 21:59+0000\n"
-"PO-Revision-Date: 2010-03-28 18:02+0300\n"
-"Last-Translator: Žygimantas BeruÄ?ka <zygis gnome org>\n"
-"Language-Team: Lithuanian <gnome-lt lists akl lt>\n"
-"Language: lt\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=cheese&component=general\n"
+"POT-Creation-Date: 2010-09-27 21:33+0000\n"
+"PO-Revision-Date: 2010-10-03 15:10+0200\n"
+"Last-Translator: Rimas Kudelis <rq akl lt>\n"
+"Language-Team: Lithuanian <komp_lt konferencijos lt>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
"100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Virtaal 0.5.2\n"
+"X-Generator: Virtaal 0.6.1\n"
-#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:113
+#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:118
msgid "Cheese"
msgstr "Cheese"
@@ -38,35 +40,30 @@ msgstr "Fotografuokite ir filmuokite internetine kamera, su įdomiais efektais"
#: ../data/cheese.schemas.in.h:3
msgid ""
"A list of effects applied on startup. Possible values are: \"mauve\", "
-"\"noir_blanc\", \"saturation\", \"hulk\", \"vertical-flip\", \"horizontal-flip\", "
-"\"shagadelic\", \"vertigo\", \"edge\", \"dice\" and \"warp\""
+"\"noir_blanc\", \"saturation\", \"hulk\", \"vertical-flip\", \"horizontal-"
+"flip\", \"shagadelic\", \"vertigo\", \"edge\", \"dice\" and \"warp\""
msgstr ""
"Efektai, įjungiami paleidžiant programÄ?. Galimos reikÅ¡mÄ?s: â??mauveâ??, "
"â??noir_blancâ??, â??saturationâ??, â??hulkâ??, â??vertical-flipâ??, â??horizontal-flipâ??, "
"â??shagadelicâ??, â??vertigoâ??, â??edgeâ??, â??diceâ?? ir â??warpâ??"
#: ../data/cheese.schemas.in.h:4
-#| msgid "Adjusts brightness level of the picture coming from the webcam"
msgid "Adjusts brightness level of the picture coming from the camera"
msgstr "Reguliuoja kameros teikiamo vaizdo skaistį"
#: ../data/cheese.schemas.in.h:5
-#| msgid "Adjusts contrast level of the picture coming from the webcam"
msgid "Adjusts contrast level of the picture coming from the camera"
msgstr "Reguliuoja kameros teikiamo vaizdo kontrastÄ?"
#: ../data/cheese.schemas.in.h:6
-#| msgid "Adjusts hue level of the picture coming from the webcam"
msgid "Adjusts hue level of the picture coming from the camera"
msgstr "Reguliuoja kameros teikiamo vaizdo atspalvį"
#: ../data/cheese.schemas.in.h:7
-#| msgid "Adjusts saturation level of the picture coming from the webcam"
msgid "Adjusts saturation level of the picture coming from the camera"
msgstr "Reguliuoja kameros teikiamo vaizdo grynį"
#: ../data/cheese.schemas.in.h:8
-#| msgid "Webcam device string indicator"
msgid "Camera device string indicator"
msgstr "Kameros įrenginio sekos indikatorius"
@@ -91,9 +88,6 @@ msgid "Height resolution"
msgstr "AukÅ¡Ä?io geba"
#: ../data/cheese.schemas.in.h:12
-#| msgid ""
-#| "If set to true, Cheese will startup in a wide mode with the image "
-#| "collection placed on the right side. Useful with small screens."
msgid ""
"If set to true, Cheese will start up in a wide mode with the image "
"collection placed on the right-hand side. Useful with small screens."
@@ -108,8 +102,7 @@ msgid ""
"feature can be dangerous, so use caution."
msgstr ""
"Jei nustatytas teigiama reikÅ¡mÄ?, Cheese galÄ?s iÅ¡ karto iÅ¡trinti failÄ?, "
-"nesiunÄ?iant jo į Å¡iukÅ¡linÄ?. Å i funkcija gali bÅ«ti pavojinga, bÅ«kite "
-"atsargūs."
+"nesiunÄ?iant jo į Å¡iukÅ¡linÄ?. Å i funkcija gali bÅ«ti pavojinga, bÅ«kite atsargÅ«s."
#: ../data/cheese.schemas.in.h:14
msgid "Milliseconds between photos in burst mode."
@@ -146,49 +139,57 @@ msgstr "Pasirinkti efektai"
#: ../data/cheese.schemas.in.h:22
msgid "Set to True to show countdown when taking a photo"
msgstr ""
-"Nustatykite teigiamÄ? reikÅ¡mÄ?, jei norite matyti atgalinį laikÄ? "
-"fotografuojant"
+"Nustatykite teigiamÄ? reikÅ¡mÄ?, jei norite matyti atgalinį laikÄ? fotografuojant"
#: ../data/cheese.schemas.in.h:23
-#| msgid "The device which points to the webcam (e.g. /dev/video0)"
+msgid "Set to True to use flash when taking a photo"
+msgstr ""
+"Nustatykite teigiamÄ? reikÅ¡mÄ?, jei prieÅ¡ fotografuojant norite matyti "
+"atbulinÄ? laiko atskaitÄ?"
+
+#: ../data/cheese.schemas.in.h:24
msgid "The device which points to the camera (e.g. /dev/video0)"
msgstr "Ä®renginys, rodantis į kamerÄ? (pvz., /dev/video0)"
-#: ../data/cheese.schemas.in.h:24
+#: ../data/cheese.schemas.in.h:25
msgid "The height resolution of the image captured from the camera"
msgstr "Kameros priimamo vaizdo vertikali skiriamoji geba."
-#: ../data/cheese.schemas.in.h:25
+#: ../data/cheese.schemas.in.h:26
msgid ""
"The length of time, in milliseconds, to delay between taking each photo in a "
"burst sequence of photos."
msgstr "Intervalas milisekundÄ?mis tarp dviejų nuotraukų pliÅ«psnio serijoje."
-#: ../data/cheese.schemas.in.h:26
+#: ../data/cheese.schemas.in.h:27
msgid "The number of photos to take in a single burst."
msgstr "Nuotraukų skaiÄ?ius viename pliÅ«psnyje."
-#: ../data/cheese.schemas.in.h:27
+#: ../data/cheese.schemas.in.h:28
msgid "The width resolution of the image captured from the camera"
msgstr "Kameros priimamo vaizdo horizontali skiriamoji geba."
-#: ../data/cheese.schemas.in.h:28
+#: ../data/cheese.schemas.in.h:29
msgid "Use a countdown"
msgstr "Naudoti atgalinÄ? laiko atskaitÄ?"
-#: ../data/cheese.schemas.in.h:29
+#: ../data/cheese.schemas.in.h:30
+msgid "Use a flash"
+msgstr "Naudoti blykstÄ?"
+
+#: ../data/cheese.schemas.in.h:31
msgid "Video Path"
msgstr "Vaizdo įrašų kelias"
-#: ../data/cheese.schemas.in.h:30
+#: ../data/cheese.schemas.in.h:32
msgid "Whether to enable immediate deletion"
msgstr "Ar įjungti neatidÄ?liotinÄ? paÅ¡alinimÄ?"
-#: ../data/cheese.schemas.in.h:31
+#: ../data/cheese.schemas.in.h:33
msgid "Whether to start in wide mode"
msgstr "Ar pradÄ?ti darbÄ? plaÄ?iojoje veiksenoje"
-#: ../data/cheese.schemas.in.h:32
+#: ../data/cheese.schemas.in.h:34
msgid "Width resolution"
msgstr "Horizontali skiriamoji geba"
@@ -208,7 +209,7 @@ msgstr "Perjungti į video veiksenÄ?"
msgid "Switch to the Effects Selector"
msgstr "Perjungti į efektų parinkiklį"
-#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:57 ../src/cheese-window.c:869
+#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:61 ../src/cheese-window.c:884
msgid "_Effects"
msgstr "_Efektai"
@@ -216,7 +217,7 @@ msgstr "_Efektai"
msgid "_Leave Fullscreen"
msgstr "_Palikti viso ekrano veiksenÄ?"
-#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:68 ../src/cheese-window.c:59
+#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:72 ../src/cheese-window.c:59
msgid "_Take a Photo"
msgstr "_Fotografuoti"
@@ -233,7 +234,6 @@ msgid "Contrast"
msgstr "Kontrastas"
#: ../data/cheese-prefs.ui.h:4
-#| msgid "Delay between photos (secs.)"
msgid "Delay between photos (seconds)"
msgstr "Intervalas tarp nuotraukų (sekundÄ?mis)"
@@ -269,12 +269,11 @@ msgstr "Grynis"
msgid "Webcam"
msgstr "Žiniatinklio kamera"
-#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:632
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:640
msgid "Shutter sound"
msgstr "Užrakto garsas"
#: ../libcheese/cheese-avatar-chooser.c:236
-#| msgid "_Take a photo"
msgid "Take a photo"
msgstr "Fotografuoti"
@@ -286,26 +285,24 @@ msgstr "_Fotografuoti"
msgid "_Discard photo"
msgstr "_Atsisakyti nuotraukos"
-#: ../libcheese/cheese-camera-device.c:327
+#: ../libcheese/cheese-camera-device.c:328
msgid "Device capabilities not supported"
msgstr "Įrenginio galimybÄ?s nepalaikomos"
-#: ../libcheese/cheese-camera-device.c:488
+#: ../libcheese/cheese-camera-device.c:510
msgid "Unknown device"
msgstr "Nežinomas įrenginys"
-#: ../libcheese/cheese-camera-device.c:512
+#: ../libcheese/cheese-camera-device.c:534
msgid "Cancellable initialization not supported"
msgstr "Atšauktina inicializacija nepalaikoma"
-#: ../libcheese/cheese-camera.c:1134
+#: ../libcheese/cheese-camera.c:1139
#, c-format
-#| msgid "No camera found!"
msgid "No device found"
msgstr "Įrenginių nerasta"
-#: ../libcheese/cheese-camera.c:1153
-#| msgid "One or more needed gstreamer elements are missing: "
+#: ../libcheese/cheese-camera.c:1158
msgid "One or more needed GStreamer elements are missing: "
msgstr "NÄ?ra vieno ar daugiau reikalingų GStreamer elementų:"
@@ -315,8 +312,8 @@ msgstr "NÄ?ra vieno ar daugiau reikalingų GStreamer elementų:"
#. * To enable to show the numbers in your own language, use %Id instead.
#. * Please leave the additional whitespace after the number
#.
-#: ../libcheese/cheese-countdown.c:436 ../libcheese/cheese-countdown.c:455
-#: ../libcheese/cheese-countdown.c:474
+#: ../libcheese/cheese-countdown.c:441 ../libcheese/cheese-countdown.c:460
+#: ../libcheese/cheese-countdown.c:479
#, c-format
msgid "%d "
msgstr "%d "
@@ -403,7 +400,7 @@ msgstr "Tikrai perkelti visas nuotraukas ir video įraÅ¡us į Å¡iukÅ¡linÄ??"
msgid "_Move to Trash"
msgstr "_Perkelti į Å¡iukÅ¡linÄ?"
-#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:654
+#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:662
msgid "Unable to open help file for Cheese"
msgstr "Nepavyko atverti Cheese žinyno"
@@ -496,7 +493,7 @@ msgstr "IÅ¡kreiptas"
msgid "No camera found!"
msgstr "Nerasta kamera!"
-#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1219
+#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1258
msgid "Please refer to the help for further information."
msgstr "Daugiau informacijos žinyne."
@@ -536,36 +533,39 @@ msgstr "_Pliūpsnis"
msgid "Countdown"
msgstr "Uždelsimas"
-#: ../src/cheese-ui.h:64
+#: ../src/cheese-ui.h:57
+msgid "Flash"
+msgstr "BlykstÄ?"
+
+#: ../src/cheese-ui.h:68
msgid "_Wide mode"
msgstr "_PlaÄ?ioji veiksena"
-#: ../src/cheese-ui.h:71
+#: ../src/cheese-ui.h:75
msgid "_Recording"
msgstr "_Įrašoma"
-#: ../src/cheese-ui.h:74 ../src/cheese-window.c:62
+#: ../src/cheese-ui.h:78 ../src/cheese-window.c:62
msgid "_Take multiple Photos"
msgstr "Fotografuoti _kelis kartus"
-#: ../src/cheese-ui.h:78
+#: ../src/cheese-ui.h:82
msgid "_Open"
msgstr "_Atverti"
-#: ../src/cheese-ui.h:80
-#| msgid "Save _As..."
+#: ../src/cheese-ui.h:84
msgid "Save _Asâ?¦"
msgstr "Įrašyti _taip�"
-#: ../src/cheese-ui.h:82
+#: ../src/cheese-ui.h:86
msgid "Move to _Trash"
msgstr "Perkelti į _Å¡iukÅ¡linÄ?"
-#: ../src/cheese-ui.h:84
+#: ../src/cheese-ui.h:88
msgid "Delete"
msgstr "Trinti"
-#: ../src/cheese-ui.h:89
+#: ../src/cheese-ui.h:93
msgid "Move All to Trash"
msgstr "Perkelti visus į Å¡iukÅ¡linÄ?"
@@ -577,21 +577,22 @@ msgstr "_PradÄ?ti įraÅ¡ymÄ?"
msgid "_Stop Recording"
msgstr "_Sustabdyti įraÅ¡ymÄ?"
-#: ../src/cheese.c:96
+#: ../src/cheese.c:97
msgid "Be verbose"
msgstr "Išsamūs pranešimai"
-#: ../src/cheese.c:98
+#: ../src/cheese.c:99
msgid "Enable wide mode"
msgstr "Ä®jungti plaÄ?iÄ?jÄ? veiksenÄ?"
-#: ../src/cheese.c:100
+#: ../src/cheese.c:101
msgid "output version information and exit"
msgstr "parodyti informacijÄ? apie programos laidÄ? ir baigti darbÄ?"
-#: ../src/cheese.c:115
+#: ../src/cheese.c:120
msgid "- Take photos and videos with your webcam, with fun graphical effects"
-msgstr "â?? Fotografuokite ir filmuokite internetine kamera, su įdomiais efektais"
+msgstr ""
+"â?? Fotografuokite ir filmuokite internetine kamera, su įdomiais efektais"
#~ msgid "Could not set the Account Photo"
#~ msgstr "Nepavyko nustatyti paskyros nuotraukos"
diff --git a/po/nb.po b/po/nb.po
index 107b3cc..ac6f9ba 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: cheese 2.31.x\n"
+"Project-Id-Version: cheese 2.91.x\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 13:56+0200\n"
-"PO-Revision-Date: 2010-08-04 13:57+0200\n"
+"POT-Creation-Date: 2010-10-16 12:24+0200\n"
+"PO-Revision-Date: 2010-10-16 12:24+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
"Language-Team: Norsk bokmål <i18n-nb lister ping uio no>\n"
"Language: \n"
@@ -17,7 +17,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../data/cheese-about.ui.h:1 ../data/cheese.desktop.in.in.h:1
-#: ../src/cheese-main.vala:105
+#: ../src/cheese-main.vala:102
msgid "Cheese"
msgstr "Cheese"
@@ -344,45 +344,45 @@ msgstr "Om programmet skal startes i bred modus"
msgid "Width resolution"
msgstr "Breddeoppløsning"
-#: ../libcheese/cheese-avatar-chooser.c:110
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.vala:594
msgid "Shutter sound"
msgstr "Lyd for lukker"
-#: ../libcheese/cheese-avatar-chooser.c:236
+#: ../libcheese/cheese-avatar-chooser.c:238
msgid "Take a photo"
msgstr "Ta et bilde"
-#: ../libcheese/cheese-avatar-chooser.c:255
+#: ../libcheese/cheese-avatar-chooser.c:257
msgid "_Take a photo"
msgstr "_Ta et bilde"
-#: ../libcheese/cheese-avatar-chooser.c:270
+#: ../libcheese/cheese-avatar-chooser.c:272
msgid "_Discard photo"
msgstr "_Forkast bilde"
-#: ../libcheese/cheese-camera-device.c:328
+#: ../libcheese/cheese-camera-device.c:329
msgid "Device capabilities not supported"
msgstr "Enhetens funksjoner er ikke støttet"
-#: ../libcheese/cheese-camera-device.c:352
+#: ../libcheese/cheese-camera-device.c:357
#, c-format
msgid "Failed to initialize device %s for capability probing"
msgstr "Klarte ikke å initiere enhet %s for å spørre etter støttede funksjoner"
-#: ../libcheese/cheese-camera-device.c:510
+#: ../libcheese/cheese-camera-device.c:515
msgid "Unknown device"
msgstr "Ukjent enhet"
-#: ../libcheese/cheese-camera-device.c:534
+#: ../libcheese/cheese-camera-device.c:539
msgid "Cancellable initialization not supported"
msgstr "Avbrytbar initiering er ikke støttet"
-#: ../libcheese/cheese-camera.c:1128
+#: ../libcheese/cheese-camera.c:1156
#, c-format
msgid "No device found"
msgstr "Ingen enhet funnet"
-#: ../libcheese/cheese-camera.c:1147
+#: ../libcheese/cheese-camera.c:1175
msgid "One or more needed GStreamer elements are missing: "
msgstr "Ett eller flere nødvendige GStreamer-elementer mangler: "
@@ -398,75 +398,41 @@ msgstr "Ett eller flere nødvendige GStreamer-elementer mangler: "
msgid "%d "
msgstr "%d "
-#: ../src/cheese-main.vala:38
-msgid "Be verbose"
-msgstr "Gi mye informasjon"
+#: ../src/cheese-effects-manager.vala:116
+msgid "No Effect"
+msgstr "Ingen effekt"
-#: ../src/cheese-main.vala:39
+#: ../src/cheese-main.vala:37
msgid "Enable wide mode"
msgstr "Aktiver bred modus"
-#: ../src/cheese-main.vala:40
+#: ../src/cheese-main.vala:38
+msgid "Device to use as a camera"
+msgstr "Enhet som skal brukes som kamera"
+
+#: ../src/cheese-main.vala:38
+msgid "DEVICE"
+msgstr "ENHET"
+
+#: ../src/cheese-main.vala:39
msgid "Output version information and exit"
msgstr "Vis versjonsinformasjon og avslutt"
-#: ../src/cheese-main.vala:75
+#: ../src/cheese-main.vala:66
msgid "- Take photos and videos from your webcam"
msgstr "- Ta bilder og video fra ditt webkamera"
-#: ../src/cheese-main.vala:86
+#: ../src/cheese-main.vala:77
#, c-format
msgid "Run '%s --help' to see a full list of available command line options.\n"
msgstr ""
"Kjør «%s --help» for å se en full liste med tilgjengelige "
"kommandolinjeflagg.\n"
-#: ../src/cheese-window.vala:604
+#: ../src/cheese-window.vala:689
msgid "Stop _Recording"
msgstr "Sto_pp opptak"
-#: ../src/cheese-window.vala:723
+#: ../src/cheese-window.vala:821
msgid "No effects found"
msgstr "Ingen effekter funnet"
-
-#~ msgid "Historical"
-#~ msgstr "Historisk"
-
-#~ msgid "Dice"
-#~ msgstr "Terning"
-
-#~ msgid "Edge"
-#~ msgstr "Kant"
-
-#~ msgid "Hulk"
-#~ msgstr "Hulk"
-
-#~ msgid "No Effect"
-#~ msgstr "Ingen effekt"
-
-#~ msgid "Mauve"
-#~ msgstr "Mauve"
-
-#~ msgid "Noir/Blanc"
-#~ msgstr "Noir/Blanc"
-
-#~ msgid "Optical Illusion"
-#~ msgstr "Optisk illusjon"
-
-#~ msgid "Quark"
-#~ msgstr "Kvark"
-
-#~ msgid "Radioactive"
-#~ msgstr "Radioaktiv"
-
-#~ msgid "Shagadelic"
-#~ msgstr "Shagadelic"
-
-#~ msgid "Kung-Fu"
-#~ msgstr "Kung-Fu"
-
-#~ msgid "Vertigo"
-#~ msgstr "Vertigo"
-
-#~ msgid "Warp"
-#~ msgstr "Warp"
diff --git a/po/nl.po b/po/nl.po
index 3dacb37..7db5aab 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,26 +5,32 @@
# Max Beauchez <max 780 gmail com>, 2007
# Wouter Bolsterlee <wbolster gnome org>, 2007, 2008
# Tino Meinen <a t meinen chello nl>, 2008
+# Reinout van Schouwen <reinouts gnome org>, 2010
#
msgid ""
msgstr ""
"Project-Id-Version: Cheese\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-16 21:33+0200\n"
-"PO-Revision-Date: 2008-09-16 21:41+0200\n"
-"Last-Translator: Wouter Bolsterlee <wbolster gnome org>\n"
+"POT-Creation-Date: 2010-09-19 21:43+0200\n"
+"PO-Revision-Date: 2010-09-19 21:11+0200\n"
+"Last-Translator: Reinout van Schouwen <reinouts gnome org>\n"
"Language-Team: Dutch\n"
+"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:118
+msgid "Cheese"
+msgstr "Cheese"
+
# Vincent, Reinout en Tino zijn voor (Wouter Bolsterlee)
-#: ../data/cheese.desktop.in.in.h:1
+#: ../data/cheese.desktop.in.in.h:2
msgid "Cheese Webcam Booth"
msgstr "Cheese webcamstudio"
-#: ../data/cheese.desktop.in.in.h:2 ../src/cheese-window.c:1012
+#: ../data/cheese.desktop.in.in.h:3 ../src/cheese-commands-help.c:118
msgid "Take photos and videos with your webcam, with fun graphical effects"
msgstr "Foto's en video's met een webcam maken, met leuke visuele effecten"
@@ -41,6 +47,26 @@ msgstr ""
"â??shagadelicâ??, â??vertigoâ??, â??edgeâ??, â??diceâ?? en â??warpâ??."
#: ../data/cheese.schemas.in.h:4
+msgid "Adjusts brightness level of the picture coming from the camera"
+msgstr "Past helderheidsniveau aan van de afbeelding genomen met de camera"
+
+#: ../data/cheese.schemas.in.h:5
+msgid "Adjusts contrast level of the picture coming from the camera"
+msgstr "Past contrastniveau aan van de afbeelding genomen met de camera"
+
+#: ../data/cheese.schemas.in.h:6
+msgid "Adjusts hue level of the picture coming from the camera"
+msgstr "Past kleurtint aan van de afbeelding genomen met de camera"
+
+#: ../data/cheese.schemas.in.h:7
+msgid "Adjusts saturation level of the picture coming from the camera"
+msgstr "Past verzadigingsniveau aan van de afbeelding genomen met de camera"
+
+#: ../data/cheese.schemas.in.h:8
+msgid "Camera device string indicator"
+msgstr "String-indicator camera-apparaat"
+
+#: ../data/cheese.schemas.in.h:9
msgid ""
"Defines the path where the photos are stored, if empty \"XDG_PHOTO/Webcam\" "
"will be used."
@@ -48,7 +74,7 @@ msgstr ""
"Geeft aan waar de foto's opgeslagen worden. Indien leeggelaten wordt "
"â??XDG_PHOTO/Webcamâ?? gebruikt."
-#: ../data/cheese.schemas.in.h:5
+#: ../data/cheese.schemas.in.h:10
msgid ""
"Defines the path where the videos are stored, if empty \"XDG_VIDEO/Webcam\" "
"will be used."
@@ -56,68 +82,121 @@ msgstr ""
"Geeft aan waar de video's opgeslagen worden. Indien leeggelaten wordt "
"â??XDG_PHOTO/Webcamâ?? gebruikt."
-#: ../data/cheese.schemas.in.h:6
+#: ../data/cheese.schemas.in.h:11
msgid "Height resolution"
msgstr "Hoogte-resolutie"
+#: ../data/cheese.schemas.in.h:12
+msgid ""
+"If set to true, Cheese will start up in a wide mode with the image "
+"collection placed on the right-hand side. Useful with small screens."
+msgstr ""
+"Indien ingeschakeld zal Cheese opstarten in een brede modus met de "
+"afbeeldingsverzameling geplaatst aan de rechterkant. Handig met kleine "
+"schermen."
+
# Vrij vertaald (Wouter Bolsterlee)
-#: ../data/cheese.schemas.in.h:7
+#: ../data/cheese.schemas.in.h:13
msgid ""
"If set to true, then Cheese will have a feature allowing you to delete a "
"file immediately and in-place, instead of moving it to the trash. This "
"feature can be dangerous, so use caution."
msgstr ""
-"Indien ingeschakeld maakt Chees het mogelijk een bestand direct te "
+"Indien ingeschakeld maakt Cheese het mogelijk een bestand direct te "
"verwijderen zonder het in de prullenbak te gooien. Deze optie kan gevaarlijk "
"zijn, omdat deze bestanden niet meer te herstellen zullen zijn."
-#: ../data/cheese.schemas.in.h:8
+#: ../data/cheese.schemas.in.h:14
+msgid "Milliseconds between photos in burst mode."
+msgstr "Milliseconden tussen foto's in burst-modus."
+
+#: ../data/cheese.schemas.in.h:15
+msgid "Number of photos in burst mode."
+msgstr "Aantal foto's in burst-modus."
+
+#: ../data/cheese.schemas.in.h:16
msgid "Photo Path"
msgstr "Pad naar foto's"
-#: ../data/cheese.schemas.in.h:9
+#: ../data/cheese.schemas.in.h:17
+msgid "Picture brightness"
+msgstr "Afbeeldingshelderheid"
+
+#: ../data/cheese.schemas.in.h:18
+msgid "Picture contrast"
+msgstr "Afbeeldingscontrast"
+
+#: ../data/cheese.schemas.in.h:19
+msgid "Picture hue"
+msgstr "Afbeeldingstint"
+
+#: ../data/cheese.schemas.in.h:20
+msgid "Picture saturation"
+msgstr "Afbeeldingsverzadiging"
+
+#: ../data/cheese.schemas.in.h:21
msgid "Selected Effects"
msgstr "Geselecteerde effecten"
-#: ../data/cheese.schemas.in.h:10
+#: ../data/cheese.schemas.in.h:22
msgid "Set to True to show countdown when taking a photo"
msgstr "Of er afgeteld moet worden bij het maken van een foto"
-#: ../data/cheese.schemas.in.h:11
-msgid "The device which points to the webcam (e.g. /dev/video0)"
-msgstr "Het pad naar het webcam-apparaat, bijvoorbeeld â??/dev/video0â??"
+#: ../data/cheese.schemas.in.h:23
+msgid "Set to True to use flash when taking a photo"
+msgstr "Inschakelen om te flitsen bij het maken van een foto"
-#: ../data/cheese.schemas.in.h:12
+#: ../data/cheese.schemas.in.h:24
+msgid "The device which points to the camera (e.g. /dev/video0)"
+msgstr "Het apparaat dat naar de camera verwijst (bijvoorbeeld /dev/video0)"
+
+#: ../data/cheese.schemas.in.h:25
msgid "The height resolution of the image captured from the camera"
msgstr "De hoogte-resolutie van de afbeelding genomen met de camera"
-#: ../data/cheese.schemas.in.h:13
+#: ../data/cheese.schemas.in.h:26
+msgid ""
+"The length of time, in milliseconds, to delay between taking each photo in a "
+"burst sequence of photos."
+msgstr ""
+"De tijdsduur in milliseconden om te wachten tussen het maken van elke foto "
+"in een burst-opvolging van foto's."
+
+#: ../data/cheese.schemas.in.h:27
+msgid "The number of photos to take in a single burst."
+msgstr "Het aantal in een enkele burst te nemen foto's."
+
+#: ../data/cheese.schemas.in.h:28
msgid "The width resolution of the image captured from the camera"
msgstr "De breedte-resolutie van de afbeelding genomen met de camera"
-#: ../data/cheese.schemas.in.h:14
+#: ../data/cheese.schemas.in.h:29
msgid "Use a countdown"
msgstr "Aftellen gebruiken"
-#: ../data/cheese.schemas.in.h:15
+#: ../data/cheese.schemas.in.h:30
+msgid "Use a flash"
+msgstr "Flits gebruiken"
+
+#: ../data/cheese.schemas.in.h:31
msgid "Video Path"
msgstr "Pad naar video's"
-#: ../data/cheese.schemas.in.h:16
-msgid "Webcam device string indicator"
-msgstr "Pad naar het webcam-apparaat"
-
-#: ../data/cheese.schemas.in.h:17
+#: ../data/cheese.schemas.in.h:32
msgid "Whether to enable immediate deletion"
msgstr "Of direct verwijderen ingeschakeld is"
-#: ../data/cheese.schemas.in.h:18
+#: ../data/cheese.schemas.in.h:33
+msgid "Whether to start in wide mode"
+msgstr "Of Cheese in breedbeeldmodus moet starten"
+
+#: ../data/cheese.schemas.in.h:34
msgid "Width resolution"
msgstr "Breedte-resolutie"
-#: ../data/cheese.ui.h:1 ../src/cheese.c:177
-msgid "Cheese"
-msgstr "Cheese"
+#: ../data/cheese.ui.h:1
+msgid "Switch to Burst Mode"
+msgstr "Naar burst-modus wisselen"
#: ../data/cheese.ui.h:2
msgid "Switch to Photo Mode"
@@ -131,8 +210,7 @@ msgstr "Naar video-modus wisselen"
msgid "Switch to the Effects Selector"
msgstr "Naar selectie van effecten wisselen"
-#: ../data/cheese.ui.h:5 ../src/cheese-window.c:1136
-#: ../src/cheese-window.c:1375
+#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:61 ../src/cheese-window.c:884
msgid "_Effects"
msgstr "_Effecten"
@@ -140,77 +218,94 @@ msgstr "_Effecten"
msgid "_Leave Fullscreen"
msgstr "Volledig scherm _verlaten"
-#: ../data/cheese.ui.h:7 ../src/cheese-window.c:1387
-msgid "_Photo"
-msgstr "_Foto"
-
-#: ../data/cheese.ui.h:8 ../src/cheese-window.c:1439
+#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:72 ../src/cheese-window.c:59
msgid "_Take a Photo"
msgstr "Foto _nemen"
-#: ../data/cheese.ui.h:9 ../src/cheese-window.c:1388
-msgid "_Video"
-msgstr "_Video"
-
#: ../data/cheese-prefs.ui.h:1
-msgid "<b>Camera</b>"
-msgstr "<b>Camera</b>"
+msgid "Brightness"
+msgstr "Helderheid"
#: ../data/cheese-prefs.ui.h:2
-msgid "<b>Resolution</b>"
-msgstr "<b>Resolutie</b>"
+msgid "Burst mode"
+msgstr "Burst-modus"
-#: ../data/cheese-prefs.ui.h:3 ../src/cheese-window.c:1379
-msgid "Preferences"
-msgstr "Voorkeuren"
+#: ../data/cheese-prefs.ui.h:3
+msgid "Contrast"
+msgstr "Contrast"
-#: ../src/cheese-effect-chooser.c:60
-msgid "No Effect"
-msgstr "Geen effect"
+#: ../data/cheese-prefs.ui.h:4
+msgid "Delay between photos (seconds)"
+msgstr "Vertraging tussen foto's (seconden)"
-#: ../src/cheese-effect-chooser.c:62
-msgid "Mauve"
-msgstr "Zacht paars"
+#: ../data/cheese-prefs.ui.h:5
+msgid "Device"
+msgstr "Apparaat"
-#: ../src/cheese-effect-chooser.c:64
-msgid "Noir/Blanc"
-msgstr "Zwart/wit"
+#: ../data/cheese-prefs.ui.h:6
+msgid "Hue"
+msgstr "Kleurtint"
+
+#: ../data/cheese-prefs.ui.h:7
+msgid "Image properties"
+msgstr "Afbeeldingseigenschappen"
+
+#: ../data/cheese-prefs.ui.h:8
+msgid "Number of photos"
+msgstr "Aantal foto's"
+
+#: ../data/cheese-prefs.ui.h:9 ../src/cheese-ui.h:44
+msgid "Preferences"
+msgstr "Voorkeuren"
-#: ../src/cheese-effect-chooser.c:66
+#: ../data/cheese-prefs.ui.h:10
+msgid "Resolution"
+msgstr "Resolutie"
+
+#: ../data/cheese-prefs.ui.h:11 ../src/cheese-effect-chooser.c:66
msgid "Saturation"
msgstr "Verzadiging"
-#: ../src/cheese-effect-chooser.c:68
-msgid "Hulk"
-msgstr "Hulk"
+#: ../data/cheese-prefs.ui.h:12
+msgid "Webcam"
+msgstr "Webcam"
-#: ../src/cheese-effect-chooser.c:70
-msgid "Vertical Flip"
-msgstr "Verticaal spiegelen"
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:640
+msgid "Shutter sound"
+msgstr "Sluitergeluid"
-#: ../src/cheese-effect-chooser.c:72
-msgid "Horizontal Flip"
-msgstr "Horizontaal spiegelen"
+#: ../libcheese/cheese-avatar-chooser.c:236
+msgid "Take a photo"
+msgstr "Foto nemen"
-#: ../src/cheese-effect-chooser.c:74
-msgid "Shagadelic"
-msgstr "Shagadelic"
+#: ../libcheese/cheese-avatar-chooser.c:255
+msgid "_Take a photo"
+msgstr "Foto _nemen"
-#: ../src/cheese-effect-chooser.c:76
-msgid "Vertigo"
-msgstr "Vertigo"
+#: ../libcheese/cheese-avatar-chooser.c:270
+msgid "_Discard photo"
+msgstr "Foto ver_werpen"
-#: ../src/cheese-effect-chooser.c:78
-msgid "Edge"
-msgstr "Edge"
+#: ../libcheese/cheese-camera-device.c:328
+msgid "Device capabilities not supported"
+msgstr "Apparaatmogelijkheden niet ondersteund"
-#: ../src/cheese-effect-chooser.c:80
-msgid "Dice"
-msgstr "Versnijden"
+#: ../libcheese/cheese-camera-device.c:510
+msgid "Unknown device"
+msgstr "Onbekend apparaat"
-#: ../src/cheese-effect-chooser.c:82
-msgid "Warp"
-msgstr "Vervormen"
+#: ../libcheese/cheese-camera-device.c:534
+msgid "Cancellable initialization not supported"
+msgstr "Annuleerbare initialisatie niet ondersteund"
+
+#: ../libcheese/cheese-camera.c:1139
+#, c-format
+msgid "No device found"
+msgstr "Geen camera gevonden"
+
+#: ../libcheese/cheese-camera.c:1158
+msgid "One or more needed GStreamer elements are missing: "
+msgstr "Eén of meerdere vereiste Gstreamer-onderdelen ontbreken: "
#. TRANSLATORS:
#. * This is the countdown number when taking the photo.
@@ -218,80 +313,55 @@ msgstr "Vervormen"
#. * To enable to show the numbers in your own language, use %Id instead.
#. * Please leave the additional whitespace after the number
#.
-#: ../src/cheese-countdown.c:436 ../src/cheese-countdown.c:455
-#: ../src/cheese-countdown.c:474
+#: ../libcheese/cheese-countdown.c:441 ../libcheese/cheese-countdown.c:460
+#: ../libcheese/cheese-countdown.c:479
#, c-format
msgid "%d "
msgstr "%d "
-#: ../src/cheese-no-camera.c:96
-msgid "No camera found!"
-msgstr "Geen camera gevonden!"
-
-#: ../src/cheese-no-camera.c:97
-msgid "Please refer to the help for further information."
-msgstr "Lees de hulp voor meer informatie."
-
-#: ../src/cheese-no-camera.c:100
-msgid "Help"
-msgstr "Hulp"
-
-#: ../src/cheese-webcam.c:1546
-msgid "One or more needed gstreamer elements are missing: "
-msgstr "Een of meerdere vereiste gstreamer-onderdelen ontbreken"
-
-#: ../src/cheese-window.c:77
+#: ../src/cheese-commands-file.c:31
msgid "_Skip"
msgstr "_Overslaan"
-#: ../src/cheese-window.c:78
+#: ../src/cheese-commands-file.c:32
msgid "S_kip All"
msgstr "_Alle overslaan"
-#: ../src/cheese-window.c:79
+#: ../src/cheese-commands-file.c:33
msgid "Delete _All"
msgstr "Alles ver_wijderen"
-#: ../src/cheese-window.c:201
-#, c-format
-msgid ""
-"Failed to open browser to show:\n"
-"%s"
-msgstr "Kon geen browser openen om â??%sâ?? te tonen"
-
-#: ../src/cheese-window.c:225
-#, c-format
-msgid ""
-"Failed to open email client to send message to:\n"
-"%s"
-msgstr "Kon geen e-mailprogramma openen om een bericht naar â??%sâ?? te versturen"
-
-#: ../src/cheese-window.c:465
+# Kromme vertaling (RvS)
+#: ../src/cheese-commands-file.c:57
#, c-format
msgid ""
"Failed to launch program to show:\n"
+"%s\n"
+"%s"
+msgstr ""
+"Programma opstarten mislukt om te tonen:\n"
+"%s\n"
"%s"
-msgstr "Kon geen toepassing starten om â??%sâ?? te tonen"
-#: ../src/cheese-window.c:484
+#: ../src/cheese-commands-file.c:78
msgid "Save File"
msgstr "Bestand opslaan"
-#: ../src/cheese-window.c:522
+#: ../src/cheese-commands-file.c:116
#, c-format
msgid "Could not save %s"
msgstr "Kon %s niet opslaan"
-#: ../src/cheese-window.c:545
+#: ../src/cheese-commands-file.c:139
msgid "Error while deleting"
msgstr "Fout bij verwijderen"
-#: ../src/cheese-window.c:546
+#: ../src/cheese-commands-file.c:140
#, c-format
msgid "The file \"%s\" cannot be deleted. Details: %s"
msgstr "Het bestand â??%sâ?? kon niet verwijderd worden. Details: %s"
-#: ../src/cheese-window.c:573
+#: ../src/cheese-commands-file.c:167
#, c-format
msgid "Are you sure you want to permanently delete the %'d selected item?"
msgid_plural ""
@@ -301,62 +371,54 @@ msgstr[0] ""
msgstr[1] ""
"Weet u zeker dat u de %'d geselecteerde items permanent wilt verwijderen?"
-#: ../src/cheese-window.c:580
+#: ../src/cheese-commands-file.c:174
#, c-format
msgid "Are you sure you want to permanently delete \"%s\"?"
msgstr "Weet u zeker dat u â??%sâ?? permanent wilt verwijderen?"
-#: ../src/cheese-window.c:583
+#: ../src/cheese-commands-file.c:177
#, c-format
msgid "If you delete an item, it will be permanently lost."
msgstr "Als u een item verwijdert zal het onherstelbaar verloren gaan."
-#: ../src/cheese-window.c:604
+#: ../src/cheese-commands-file.c:198
msgid "Unknown Error"
msgstr "Onbekende fout"
-#: ../src/cheese-window.c:634
+#: ../src/cheese-commands-file.c:228
msgid "Cannot move file to trash, do you want to delete immediately?"
msgstr ""
"Kan het bestand niet in de prullenbak gooien. Wilt u het toch verwijderen?"
-#: ../src/cheese-window.c:635
+#: ../src/cheese-commands-file.c:229
#, c-format
msgid "The file \"%s\" cannot be moved to the trash. Details: %s"
msgstr "Het bestand â??%sâ?? kon niet in de prullenbak gegooid worden. Details: %s"
-#: ../src/cheese-window.c:707
+#: ../src/cheese-commands-file.c:301
#, c-format
msgid "Really move all photos and videos to the trash?"
msgstr "Weet u zeker dat u alle foto's en video's in de prullenbak wil gooien?"
-#: ../src/cheese-window.c:715
+#: ../src/cheese-commands-file.c:309
msgid "_Move to Trash"
msgstr "In _prullenbak gooien"
-#: ../src/cheese-window.c:833
-#, c-format
-msgid "Could not set the Account Photo"
-msgstr "Kon accountfoto niet instellen"
-
-#: ../src/cheese-window.c:865
-msgid "Media files"
-msgstr "Media-bestanden"
-
-#: ../src/cheese-window.c:938 ../src/cheese-window.c:1210
+#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:662
msgid "Unable to open help file for Cheese"
msgstr "Kon hulpbestand voor Cheese niet openen"
-#: ../src/cheese-window.c:990
+#: ../src/cheese-commands-help.c:96
msgid "translator-credits"
msgstr ""
+"Reinout van Schouwen\n"
"Wouter Bolsterlee\n"
"Tino Meinen\n"
"Max Beauchez\n"
"\n"
"Kijk voor meer info op http://nl.gnome.org/";
-#: ../src/cheese-window.c:993
+#: ../src/cheese-commands-help.c:99
msgid ""
"This program is free software; you can redistribute it and/or modify it "
"under the terms of the GNU General Public License as published by the Free "
@@ -368,7 +430,7 @@ msgstr ""
"Software Foundation; either version 2 of the License, or (at your option) "
"any later version.\n"
-#: ../src/cheese-window.c:997
+#: ../src/cheese-commands-help.c:103
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -380,7 +442,7 @@ msgstr ""
"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
"more details.\n"
-#: ../src/cheese-window.c:1001
+#: ../src/cheese-commands-help.c:107
msgid ""
"You should have received a copy of the GNU General Public License along with "
"this program. If not, see <http://www.gnu.org/licenses/>."
@@ -388,110 +450,204 @@ msgstr ""
"You should have received a copy of the GNU General Public License along with "
"this program. If not, see <http://www.gnu.org/licenses/>."
-#: ../src/cheese-window.c:1018
+#: ../src/cheese-commands-help.c:124
msgid "Cheese Website"
msgstr "Cheese-webstek"
-#: ../src/cheese-window.c:1226
-msgid "_Start Recording"
-msgstr "Opname _starten"
+#: ../src/cheese-effect-chooser.c:60
+msgid "No Effect"
+msgstr "Geen effect"
-#: ../src/cheese-window.c:1325
-msgid "_Stop Recording"
-msgstr "Opname _stoppen"
+#: ../src/cheese-effect-chooser.c:62
+msgid "Mauve"
+msgstr "Zacht paars"
+
+#: ../src/cheese-effect-chooser.c:64
+msgid "Noir/Blanc"
+msgstr "Zwart/wit"
+
+#: ../src/cheese-effect-chooser.c:68
+msgid "Hulk"
+msgstr "Hulk"
+
+#: ../src/cheese-effect-chooser.c:70
+msgid "Vertical Flip"
+msgstr "Verticaal spiegelen"
+
+#: ../src/cheese-effect-chooser.c:72
+msgid "Horizontal Flip"
+msgstr "Horizontaal spiegelen"
+
+#: ../src/cheese-effect-chooser.c:74
+msgid "Shagadelic"
+msgstr "Shagadelic"
+
+#: ../src/cheese-effect-chooser.c:76
+msgid "Vertigo"
+msgstr "Vertigo"
+
+#: ../src/cheese-effect-chooser.c:78
+msgid "Edge"
+msgstr "Edge"
-#: ../src/cheese-window.c:1356
+#: ../src/cheese-effect-chooser.c:80
+msgid "Dice"
+msgstr "Versnijden"
+
+#: ../src/cheese-effect-chooser.c:82
+msgid "Warp"
+msgstr "Vervormen"
+
+#: ../src/cheese-no-camera.c:94
+msgid "No camera found!"
+msgstr "Geen camera gevonden!"
+
+#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1258
+msgid "Please refer to the help for further information."
+msgstr "Lees de hulp voor meer informatie."
+
+#: ../src/cheese-ui.h:32
msgid "_Cheese"
msgstr "_Cheese"
-#: ../src/cheese-window.c:1358
+#: ../src/cheese-ui.h:34
msgid "_Edit"
msgstr "Be_werken"
-#: ../src/cheese-window.c:1359
-msgid "Move All to Trash"
-msgstr "Alles in prullenbak gooien"
-
-#: ../src/cheese-window.c:1362
+#: ../src/cheese-ui.h:35
msgid "_Help"
msgstr "_Hulp"
-#: ../src/cheese-window.c:1365
+#: ../src/cheese-ui.h:38
msgid "_Contents"
msgstr "In_houd"
-#: ../src/cheese-window.c:1365
+#: ../src/cheese-ui.h:38
msgid "Help on this Application"
msgstr "Hulp voor deze toepassing"
-#: ../src/cheese-window.c:1371
+#: ../src/cheese-ui.h:48
+msgid "_Photo"
+msgstr "_Foto"
+
+#: ../src/cheese-ui.h:49
+msgid "_Video"
+msgstr "_Video"
+
+#: ../src/cheese-ui.h:50
+msgid "_Burst"
+msgstr "_Burst"
+
+#: ../src/cheese-ui.h:54
msgid "Countdown"
msgstr "Aftellen"
-#: ../src/cheese-window.c:1392
+#: ../src/cheese-ui.h:57
+msgid "Flash"
+msgstr "Flitsen"
+
+#: ../src/cheese-ui.h:68
+msgid "_Wide mode"
+msgstr "_Breedbeeldmodus"
+
+#: ../src/cheese-ui.h:75
+msgid "_Recording"
+msgstr "_Opname stoppen"
+
+#: ../src/cheese-ui.h:78 ../src/cheese-window.c:62
+msgid "_Take multiple Photos"
+msgstr "Meerdere foto's ne_men"
+
+#: ../src/cheese-ui.h:82
msgid "_Open"
msgstr "_Openen"
-#: ../src/cheese-window.c:1394
-msgid "Save _As..."
+#: ../src/cheese-ui.h:84
+msgid "Save _Asâ?¦"
msgstr "Opslaan _alsâ?¦"
-#: ../src/cheese-window.c:1396
+#: ../src/cheese-ui.h:86
msgid "Move to _Trash"
msgstr "In _prullenbak gooien"
-#: ../src/cheese-window.c:1398
+#: ../src/cheese-ui.h:88
msgid "Delete"
msgstr "Verwijderen"
-#: ../src/cheese-window.c:1403 ../src/cheese-window.c:1631
-msgid "_Take a photo"
-msgstr "Foto _nemen"
+#: ../src/cheese-ui.h:93
+msgid "Move All to Trash"
+msgstr "Alles in prullenbak gooien"
-#: ../src/cheese-window.c:1407
-msgid "_Recording"
-msgstr "_Opname sto_ppen"
+#: ../src/cheese-window.c:60
+msgid "_Start Recording"
+msgstr "Opname _starten"
-#: ../src/cheese-window.c:1411
-msgid "_Set As Account Photo"
-msgstr "Als _accountfoto instellen"
+#: ../src/cheese-window.c:61
+msgid "_Stop Recording"
+msgstr "Opname _stoppen"
-#: ../src/cheese-window.c:1415
-msgid "Send by _Mail"
-msgstr "Per _mail versturen"
+#: ../src/cheese.c:97
+msgid "Be verbose"
+msgstr "Uitgebreide informatie tonen"
-#: ../src/cheese-window.c:1419
-msgid "Send _To"
-msgstr "Ver_zenden naar"
+#: ../src/cheese.c:99
+msgid "Enable wide mode"
+msgstr "Breedbeeldmodus inschakelen"
-#: ../src/cheese-window.c:1423
-msgid "Export to F-_Spot"
-msgstr "Naar F-_Spot exporteren"
+#: ../src/cheese.c:101
+msgid "output version information and exit"
+msgstr "versie-informatie tonen en afsluiten"
-#: ../src/cheese-window.c:1427
-msgid "Export to _Flickr"
-msgstr "Naar _Flickr exporteren"
+#: ../src/cheese.c:120
+msgid "- Take photos and videos with your webcam, with fun graphical effects"
+msgstr "â?? Foto's en video's met een webcam maken, met leuke visuele effecten"
-#: ../src/cheese-window.c:1451
-msgid "_Start recording"
-msgstr "_Opname starten"
+#~ msgid "<b>Camera</b>"
+#~ msgstr "<b>Camera</b>"
-#: ../src/cheese-window.c:1774
-msgid "Quit"
-msgstr "Afsluiten"
+#~ msgid "Help"
+#~ msgstr "Hulp"
-#: ../src/cheese-window.c:1780
-msgid "About"
-msgstr "Info"
+#~ msgid ""
+#~ "Failed to open browser to show:\n"
+#~ "%s"
+#~ msgstr "Kon geen browser openen om â??%sâ?? te tonen"
-#: ../src/cheese-window.c:1861
-msgid "Check your gstreamer installation"
-msgstr "Controleer uw gstreamer-installatie"
+#~ msgid ""
+#~ "Failed to open email client to send message to:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kon geen e-mailprogramma openen om een bericht naar â??%sâ?? te versturen"
-#: ../src/cheese.c:161
-msgid "Be verbose"
-msgstr "Uitgebreide informatie tonen"
+#~ msgid "Could not set the Account Photo"
+#~ msgstr "Kon accountfoto niet instellen"
-#: ../src/cheese.c:179
-msgid "- Take photos and videos with your webcam, with fun graphical effects"
-msgstr "â?? Foto's en video's met een webcam maken, met leuke visuele effecten"
+#~ msgid "Media files"
+#~ msgstr "Media-bestanden"
+
+#~ msgid "_Set As Account Photo"
+#~ msgstr "Als _accountfoto instellen"
+
+#~ msgid "Send by _Mail"
+#~ msgstr "Per _mail versturen"
+
+#~ msgid "Send _To"
+#~ msgstr "Ver_zenden naar"
+
+#~ msgid "Export to F-_Spot"
+#~ msgstr "Naar F-_Spot exporteren"
+
+#~ msgid "Export to _Flickr"
+#~ msgstr "Naar _Flickr exporteren"
+
+#~ msgid "_Start recording"
+#~ msgstr "_Opname starten"
+
+#~ msgid "Quit"
+#~ msgstr "Afsluiten"
+
+#~ msgid "About"
+#~ msgstr "Info"
+
+#~ msgid "Check your gstreamer installation"
+#~ msgstr "Controleer uw gstreamer-installatie"
diff --git a/po/nn.po b/po/nn.po
index b6e944e..a23b951 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -10,36 +10,230 @@ msgstr ""
"Project-Id-Version: cheese 0.1\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.";
"cgi?product=cheese&component=general\n"
-"POT-Creation-Date: 2010-02-21 21:37+0000\n"
-"PO-Revision-Date: 2010-03-07 22:03+0100\n"
+"POT-Creation-Date: 2010-07-20 18:43+0000\n"
+"PO-Revision-Date: 2010-07-27 13:54+0200\n"
"Last-Translator: Torstein Adolf Winterseth <kvikende fsfe org>\n"
-"Language-Team: Norwegian Nynorsk <i18n-nn lister ping uio no>\n"
+"Language-Team: Engelsk (Storbritannia) <kde-i18n-doc kde org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:113
+#: ../data/cheese-about.ui.h:1 ../data/cheese.desktop.in.in.h:1
+#: ../src/cheese-main.vala:105
msgid "Cheese"
msgstr "Cheese"
-#: ../data/cheese.desktop.in.in.h:2
-#| msgid "Cheese Website"
-msgid "Cheese Webcam Booth"
-msgstr "Cheese nettkamerastand"
+#: ../data/cheese-about.ui.h:2
+msgid "Cheese Website"
+msgstr "Nettstaden til Cheese"
-#: ../data/cheese.desktop.in.in.h:3 ../src/cheese-commands-help.c:118
+#: ../data/cheese-about.ui.h:3 ../data/cheese.desktop.in.in.h:3
msgid "Take photos and videos with your webcam, with fun graphical effects"
msgstr "Ta bilete og ta opp filmar med morosame effektar med nettkameraet ditt"
+#: ../data/cheese-about.ui.h:4
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>.\n"
+msgstr ""
+"Dette programmet er fri programvare. Du kan vidareformidla det og/eller "
+"endra det under vilkåra i GNU General Public License publisert av Free "
+"Software Foundation, anten versjon 2 av lisensen, eller, om du ønskjer, ein "
+"nyare versjon.\n"
+"\n"
+"Programmet er gjort tilgjengeleg med håp om at det vil vera til nytte, men "
+"UTAN NOKON GARANTI, og heller ikkje med nokon indirekte garanti om at det "
+"vil vera OMSETJELEG eller EIGNA TIL NOKO SPESIELT FORM�L. Sjå GNU General "
+"Public License for meir informasjon.\n"
+"\n"
+"Du bør ha motteken ein kopi av GNU General Public License saman med "
+"programmet. Dersom det ikkje er tilfellet gå til <http://www.gnu.";
+"org/licenses/>.\n"
+
+#: ../data/cheese-about.ui.h:10
+msgid "translator-credits"
+msgstr ""
+"Kjartan Maraas <kmaraas gnome org>\n"
+"Eskild Hustvedt <eskildh gnome org>\n"
+"Eirik U. Birkeland <eirbir gmail com>\n"
+"Torstein Adolf Winterseth <kvikende fsfe org>"
+
+#: ../data/cheese-actions.ui.h:1
+#| msgid "_Burst"
+msgid "Burst"
+msgstr "Sekvens"
+
+#: ../data/cheese-actions.ui.h:2
+#| msgid "_Leave Fullscreen"
+msgid "Fullscreen"
+msgstr "Fullskjerm"
+
+#: ../data/cheese-actions.ui.h:3
+#| msgid "_Contents"
+msgid "Help _Contents"
+msgstr "Hjelp_innhald"
+
+#: ../data/cheese-actions.ui.h:4
+msgid "Move All to Trash"
+msgstr "Flytt alle til papirkorga"
+
+#: ../data/cheese-actions.ui.h:5
+msgid "Move to _Trash"
+msgstr "Flytt til _papirkorga"
+
+#: ../data/cheese-actions.ui.h:6
+#| msgid "No Effect"
+msgid "Next Effects"
+msgstr "Neste effekt"
+
+#: ../data/cheese-actions.ui.h:7
+#| msgid "No Effect"
+msgid "Previous Effects"
+msgstr "Førre effekt"
+
+#: ../data/cheese-actions.ui.h:8
+#| msgid "Save _Asâ?¦"
+msgid "Save _As"
+msgstr "L_agra som"
+
+#: ../data/cheese-actions.ui.h:9
+#| msgid "_Take multiple Photos"
+msgid "Take _Multiple Photos"
+msgstr "_Ta fleire bilete"
+
+#: ../data/cheese-actions.ui.h:10
+#| msgid "About"
+msgid "_About"
+msgstr "_Om"
+
+#: ../data/cheese-actions.ui.h:11
+msgid "_Cheese"
+msgstr "_Cheese"
+
+#: ../data/cheese-actions.ui.h:12
+#| msgid "Delete"
+msgid "_Delete"
+msgstr "_Slett"
+
+#: ../data/cheese-actions.ui.h:13
+msgid "_Edit"
+msgstr "R_ediger"
+
+#: ../data/cheese-actions.ui.h:14 ../data/cheese-main-window.ui.h:1
+msgid "_Effects"
+msgstr "_Effektar"
+
+#: ../data/cheese-actions.ui.h:15
+msgid "_Help"
+msgstr "_Hjelp"
+
+#: ../data/cheese-actions.ui.h:16
+msgid "_Open"
+msgstr "_Opna"
+
+#: ../data/cheese-actions.ui.h:17
+msgid "_Photo"
+msgstr "_Bilete"
+
+#: ../data/cheese-actions.ui.h:18
+#| msgid "Preferences"
+msgid "_Preferences"
+msgstr "_Innstillingar"
+
+#: ../data/cheese-actions.ui.h:19
+#| msgid "Quit"
+msgid "_Quit"
+msgstr "_Avslutt"
+
+#: ../data/cheese-actions.ui.h:20
+#| msgid "_Recording"
+msgid "_Record a Video"
+msgstr "_Ta opp film"
+
+#: ../data/cheese-actions.ui.h:21 ../data/cheese-main-window.ui.h:3
+msgid "_Take a Photo"
+msgstr "_Ta eit bilete"
+
+#: ../data/cheese-actions.ui.h:22
+msgid "_Video"
+msgstr "_Film"
+
+#: ../data/cheese-actions.ui.h:23
+#| msgid "_Wide mode"
+msgid "_Wide Mode"
+msgstr "_Vid modus"
+
+#: ../data/cheese-main-window.ui.h:2
+msgid "_Leave Fullscreen"
+msgstr "_Forlat fullskjerm"
+
+#: ../data/cheese-prefs.ui.h:1
+msgid "Brightness"
+msgstr "Lysstyrke"
+
+#: ../data/cheese-prefs.ui.h:2
+msgid "Burst mode"
+msgstr "Sekvensmodus"
+
+#: ../data/cheese-prefs.ui.h:3
+msgid "Contrast"
+msgstr "Kontrast"
+
+#: ../data/cheese-prefs.ui.h:4
+msgid "Delay between photos (seconds)"
+msgstr "Tid mellom bilettaking (sekund)"
+
+#: ../data/cheese-prefs.ui.h:5
+msgid "Device"
+msgstr "Eining"
+
+#: ../data/cheese-prefs.ui.h:6
+msgid "Hue"
+msgstr "Fargetone"
+
+#: ../data/cheese-prefs.ui.h:7
+msgid "Image properties"
+msgstr "Eigenskapar til bilete"
+
+#: ../data/cheese-prefs.ui.h:8
+msgid "Number of photos"
+msgstr "Talet på bilete"
+
+#: ../data/cheese-prefs.ui.h:9
+msgid "Preferences"
+msgstr "Innstillingar"
+
+#: ../data/cheese-prefs.ui.h:10
+msgid "Resolution"
+msgstr "Oppløysing"
+
+#: ../data/cheese-prefs.ui.h:11 ../data/effects/saturation.effect.in.h:1
+msgid "Saturation"
+msgstr "Metting"
+
+#: ../data/cheese-prefs.ui.h:12
+msgid "Webcam"
+msgstr "Nettkamera"
+
+#: ../data/cheese.desktop.in.in.h:2
+msgid "Cheese Webcam Booth"
+msgstr "Cheese nettkamerastand"
+
#. Translators: please note, that the effect names are
#. standarized and should not be translated
#: ../data/cheese.schemas.in.h:3
-#| msgid ""
-#| "Effects, that are applied on startup. Possible values are: Mauve, Noir/"
-#| "Blanc, Saturation, Hulk, Vertical Flip, Horizontal Flip, Shagadelic, "
-#| "Vertigo, Edge, Dice and Warp"
msgid ""
"A list of effects applied on startup. Possible values are: \"mauve\", "
"\"noir_blanc\", \"saturation\", \"hulk\", \"vertical-flip\", \"horizontal-"
@@ -50,26 +244,22 @@ msgstr ""
"«shagadelic», «vertigo», «edge», «dice» og «warp»"
#: ../data/cheese.schemas.in.h:4
-#| msgid "The X resolution of the image captured from the camera"
msgid "Adjusts brightness level of the picture coming from the camera"
-msgstr "Still inn nivå på lysstyrken til bilete teken av kameraet"
+msgstr "Still inn nivå på lysstyrken til bilete teke av kameraet"
#: ../data/cheese.schemas.in.h:5
msgid "Adjusts contrast level of the picture coming from the camera"
-msgstr "Still inn nivå på kontrasten til bilete teken av kameraet"
+msgstr "Still inn nivå på kontrasten til bilete teke av kameraet"
#: ../data/cheese.schemas.in.h:6
-#| msgid "The X resolution of the image captured from the camera"
msgid "Adjusts hue level of the picture coming from the camera"
-msgstr "Still inn nivå på fargetonen til bilete teken av kameraet"
+msgstr "Still inn nivå på fargetonen til bilete teke av kameraet"
#: ../data/cheese.schemas.in.h:7
-#| msgid "The X resolution of the image captured from the camera"
msgid "Adjusts saturation level of the picture coming from the camera"
-msgstr "Still inn nivå på metting til bilete teken av kameraet"
+msgstr "Still inn nivå på metting til bilete teke av kameraet"
#: ../data/cheese.schemas.in.h:8
-#| msgid "Webcam device string indicator"
msgid "Camera device string indicator"
msgstr "Einingsstreng til nettkameraet"
@@ -78,19 +268,19 @@ msgid ""
"Defines the path where the photos are stored, if empty \"XDG_PHOTO/Webcam\" "
"will be used."
msgstr ""
-"Angjev stien til staden bileta vert lagra. Viss han er tom så vil "
-"«XDG_PHOTO/Webcam» brukast."
+"Oppgje stigen til staden bileta vert lagra. Viss han er tom så vil «XDG_PHOTO/"
+"Webcam» brukast."
#: ../data/cheese.schemas.in.h:10
msgid ""
"Defines the path where the videos are stored, if empty \"XDG_VIDEO/Webcam\" "
"will be used."
msgstr ""
-"Angjev stien til staden filmane vert lagra. Viss han er tom så vil "
-"«XDG_VIDEO/Webcam» brukast."
+"Oppgje stigen til staden filmane vert lagra. Viss han er tom så vil "
+"«XDG_VIDEO/"
+"Webcam» brukast."
#: ../data/cheese.schemas.in.h:11
-#| msgid "X resolution"
msgid "Height resolution"
msgstr "Høgdoppløysing"
@@ -99,8 +289,9 @@ msgid ""
"If set to true, Cheese will start up in a wide mode with the image "
"collection placed on the right-hand side. Useful with small screens."
msgstr ""
-"Om set til sann så vil Cheese starta i vid modus med biletesamlinga "
-"plassert på høgre side. Gagnleg på små skjermar."
+"Viss seten til sann så vil Cheese starta i vid modus med biletesamlinga "
+"plassert "
+"på høgre side. Gagnleg på små skjermar."
#: ../data/cheese.schemas.in.h:13
msgid ""
@@ -108,10 +299,10 @@ msgid ""
"file immediately and in-place, instead of moving it to the trash. This "
"feature can be dangerous, so use caution."
msgstr ""
-"Om set til sann så vil Cheese ha moglegheit til å sletta ei fil med ein gong "
+"Viss seten til sann så vil Cheese ha moglegheit til å sletta ei fil med ein "
+"gong "
"på staden, i staden for å flytta henne til papirkorga først. Denne "
-"funksjonen "
-"kan vera farleg så bruk med måte."
+"funksjonen kan vera farleg så bruk med måte."
#: ../data/cheese.schemas.in.h:14
msgid "Milliseconds between photos in burst mode."
@@ -122,9 +313,8 @@ msgid "Number of photos in burst mode."
msgstr "Talet på bilettakingar i sekvensmodus"
#: ../data/cheese.schemas.in.h:16
-#| msgid "_Photo"
msgid "Photo Path"
-msgstr "Sti til bilete"
+msgstr "Stig til bilete"
#: ../data/cheese.schemas.in.h:17
msgid "Picture brightness"
@@ -139,7 +329,6 @@ msgid "Picture hue"
msgstr "Fargetone på bilete"
#: ../data/cheese.schemas.in.h:20
-#| msgid "Saturation"
msgid "Picture saturation"
msgstr "Metting på bilete"
@@ -148,19 +337,16 @@ msgid "Selected Effects"
msgstr "Valde effektar"
#: ../data/cheese.schemas.in.h:22
-#| msgid "Whether a countdown should be used when taking a photo"
msgid "Set to True to show countdown when taking a photo"
-msgstr "Set til «True» for å visa nedteljinga før bilete takast"
+msgstr "Set til sann for å visa nedteljinga før bilete vert teke"
#: ../data/cheese.schemas.in.h:23
-#| msgid "The device-string which points to the webcam, e.g. /dev/video0"
msgid "The device which points to the camera (e.g. /dev/video0)"
msgstr "Eininga som peikar til nettkameraet, t.d. /dev/video0"
#: ../data/cheese.schemas.in.h:24
-#| msgid "The X resolution of the image captured from the camera"
msgid "The height resolution of the image captured from the camera"
-msgstr "Høgdoppløysinga på bilete teken av kameraet"
+msgstr "Høgdoppløysinga på bilete teke av kameraet"
#: ../data/cheese.schemas.in.h:25
msgid ""
@@ -174,18 +360,16 @@ msgid "The number of photos to take in a single burst."
msgstr "Talet på bilete som skal takast i ein biletsekvens"
#: ../data/cheese.schemas.in.h:27
-#| msgid "The X resolution of the image captured from the camera"
msgid "The width resolution of the image captured from the camera"
-msgstr "Breiddoppløysinga på bilete teken av kameraet"
+msgstr "Breiddoppløysinga på bilete teke av kameraet"
#: ../data/cheese.schemas.in.h:28
msgid "Use a countdown"
msgstr "Bruk ei nedteljing"
#: ../data/cheese.schemas.in.h:29
-#| msgid "_Video"
msgid "Video Path"
-msgstr "Sti til film"
+msgstr "Stig til film"
#: ../data/cheese.schemas.in.h:30
msgid "Whether to enable immediate deletion"
@@ -196,94 +380,70 @@ msgid "Whether to start in wide mode"
msgstr "Om programmet skal startast i vid modus"
#: ../data/cheese.schemas.in.h:32
-#| msgid "X resolution"
msgid "Width resolution"
-msgstr "BreiddoppløysingX-oppløysing"
-
-#: ../data/cheese.ui.h:1
-msgid "Switch to Burst Mode"
-msgstr "Veksla til sekvensmodus"
-
-#: ../data/cheese.ui.h:2
-msgid "Switch to Photo Mode"
-msgstr "Veksla til biletmodus"
-
-#: ../data/cheese.ui.h:3
-msgid "Switch to Video Mode"
-msgstr "Veksla til filmmodus"
+msgstr "Breiddoppløysing"
-#: ../data/cheese.ui.h:4
-msgid "Switch to the Effects Selector"
-msgstr "Veksla til effektveljaren"
+#: ../data/effects/agingtv.effect.in.h:1
+msgid "Historical"
+msgstr "Historisk"
-#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:57 ../src/cheese-window.c:869
-msgid "_Effects"
-msgstr "_Effektar"
-
-#: ../data/cheese.ui.h:6
-msgid "_Leave Fullscreen"
-msgstr "_Forlét fullskjerm"
-
-#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:68 ../src/cheese-window.c:59
-msgid "_Take a Photo"
-msgstr "_Ta eit bilete"
+#: ../data/effects/dicetv.effect.in.h:1
+msgid "Dice"
+msgstr "Terning"
-#: ../data/cheese-prefs.ui.h:1
-msgid "Brightness"
-msgstr "Lysstyrke"
+#: ../data/effects/edgetv.effect.in.h:1
+msgid "Edge"
+msgstr "Kant"
-#: ../data/cheese-prefs.ui.h:2
-msgid "Burst mode"
-msgstr "Sekvensmodus"
+#: ../data/effects/hulk.effect.in.h:1
+msgid "Hulk"
+msgstr "Hulk"
-#: ../data/cheese-prefs.ui.h:3
-msgid "Contrast"
-msgstr "Kontrast"
+#: ../data/effects/identity.effect.in.h:1
+msgid "No Effect"
+msgstr "Ingen effekt"
-#: ../data/cheese-prefs.ui.h:4
-msgid "Delay between photos (seconds)"
-msgstr "Tid mellom bilettaking (sekund)"
+#: ../data/effects/mauve.effect.in.h:1
+msgid "Mauve"
+msgstr "Mauve"
-#: ../data/cheese-prefs.ui.h:5
-#| msgid "Dice"
-msgid "Device"
-msgstr "Eining"
+#: ../data/effects/noir.effect.in.h:1
+msgid "Noir/Blanc"
+msgstr "Noir/Blanc"
-#: ../data/cheese-prefs.ui.h:6
-msgid "Hue"
-msgstr "Fargetone"
+#: ../data/effects/optv.effect.in.h:1
+msgid "Optical Illusion"
+msgstr "Optisk illusjon"
-#: ../data/cheese-prefs.ui.h:7
-msgid "Image properties"
-msgstr "Eigenskapar til bilete"
+#: ../data/effects/quarktv.effect.in.h:1
+msgid "Quark"
+msgstr "Kvark"
-#: ../data/cheese-prefs.ui.h:8
-msgid "Number of photos"
-msgstr "Talet på bilete"
+#: ../data/effects/radioactv.effect.in.h:1
+msgid "Radioactive"
+msgstr "Radioaktiv"
-#: ../data/cheese-prefs.ui.h:9 ../src/cheese-ui.h:44
-msgid "Preferences"
-msgstr "Innstillingar"
+#: ../data/effects/shagadelictv.effect.in.h:1
+msgid "Shagadelic"
+msgstr "Shagadelic"
-#: ../data/cheese-prefs.ui.h:10
-#| msgid "X resolution"
-msgid "Resolution"
-msgstr "Oppløysing"
+#: ../data/effects/streaktv.effect.in.h:1
+msgid "Kung-Fu"
+msgstr "Kung-fu"
-#: ../data/cheese-prefs.ui.h:11 ../src/cheese-effect-chooser.c:66
-msgid "Saturation"
-msgstr "Metting"
+#: ../data/effects/vertigotv.effect.in.h:1
+msgid "Vertigo"
+msgstr "Vertigo"
-#: ../data/cheese-prefs.ui.h:12
-msgid "Webcam"
-msgstr "Nettkamera"
+#: ../data/effects/warptv.effect.in.h:1
+msgid "Warp"
+msgstr "Warp"
-#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:632
+#: ../libcheese/cheese-avatar-chooser.c:110
msgid "Shutter sound"
msgstr "Lukkarlyd"
#: ../libcheese/cheese-avatar-chooser.c:236
-#| msgid "_Take a photo"
msgid "Take a photo"
msgstr "Ta eit bilete"
@@ -295,25 +455,29 @@ msgstr "_Ta eit bilete"
msgid "_Discard photo"
msgstr "_Forkast bilete"
-#: ../libcheese/cheese-camera-device.c:327
+#: ../libcheese/cheese-camera-device.c:328
msgid "Device capabilities not supported"
msgstr "Funksjonane til eininga er ikkje støtta"
-#: ../libcheese/cheese-camera-device.c:488
+#: ../libcheese/cheese-camera-device.c:352
+#, c-format
+msgid "Failed to initialize device %s for capability probing"
+msgstr "Feila å starta eining %s for formålsgransking"
+
+#: ../libcheese/cheese-camera-device.c:510
msgid "Unknown device"
msgstr "Ukjend eining"
-#: ../libcheese/cheese-camera-device.c:512
+#: ../libcheese/cheese-camera-device.c:534
msgid "Cancellable initialization not supported"
msgstr "Avbrytbar oppstart er ikkje støtta"
-#: ../libcheese/cheese-camera.c:1134
+#: ../libcheese/cheese-camera.c:1116
#, c-format
-#| msgid "No camera found!"
msgid "No device found"
msgstr "Fann inga eining"
-#: ../libcheese/cheese-camera.c:1153
+#: ../libcheese/cheese-camera.c:1135
msgid "One or more needed GStreamer elements are missing: "
msgstr "�in eller fleire nødvendige GStreamer-element manglar: "
@@ -323,295 +487,175 @@ msgstr "�in eller fleire nødvendige GStreamer-element manglar: "
#. * To enable to show the numbers in your own language, use %Id instead.
#. * Please leave the additional whitespace after the number
#.
-#: ../libcheese/cheese-countdown.c:436 ../libcheese/cheese-countdown.c:455
-#: ../libcheese/cheese-countdown.c:474
+#: ../libcheese/cheese-countdown.c:441 ../libcheese/cheese-countdown.c:460
+#: ../libcheese/cheese-countdown.c:479
#, c-format
msgid "%d "
-msgstr "%d"
+msgstr "%d "
-#: ../src/cheese-commands-file.c:31
-msgid "_Skip"
-msgstr "_Hopp over"
-
-#: ../src/cheese-commands-file.c:32
-msgid "S_kip All"
-msgstr "H_opp over alle"
-
-#: ../src/cheese-commands-file.c:33
-msgid "Delete _All"
-msgstr "Slett _alle"
-
-#: ../src/cheese-commands-file.c:57
-#, c-format
-#| msgid ""
-#| "Failed to launch program to show:\n"
-#| "%s"
-msgid ""
-"Failed to launch program to show:\n"
-"%s\n"
-"%s"
-msgstr ""
-"Klarte ikkje starta program for å visa:\n"
-"%s\n"
-"%s"
-
-#: ../src/cheese-commands-file.c:78
-msgid "Save File"
-msgstr "Lagra fil"
-
-#: ../src/cheese-commands-file.c:116
-#, c-format
-msgid "Could not save %s"
-msgstr "Klarte ikkje lagra %s"
-
-#: ../src/cheese-commands-file.c:139
-msgid "Error while deleting"
-msgstr "Feil under sletting"
+#: ../src/cheese-main.vala:38
+msgid "Be verbose"
+msgstr "Gje mykje informasjon"
-#: ../src/cheese-commands-file.c:140
-#, c-format
-#| msgid "The file \"%s\" cannot be moved to the trash. Details: %s"
-msgid "The file \"%s\" cannot be deleted. Details: %s"
-msgstr "Fila «%s» kan ikkje slettast. Detaljar: %s"
+#: ../src/cheese-main.vala:39
+msgid "Enable wide mode"
+msgstr "Slå på vid modus"
-#: ../src/cheese-commands-file.c:167
-#, c-format
-msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural ""
-"Are you sure you want to permanently delete the %'d selected items?"
-msgstr[0] "Vil du sletta det valde elementet permanent?"
-msgstr[1] "Vil du sletta dei %'d valde elementa permanent?"
+#: ../src/cheese-main.vala:40
+#| msgid "output version information and exit"
+msgid "Output version information and exit"
+msgstr "Skriv ut versjoninformasjon og avslutt"
-#: ../src/cheese-commands-file.c:174
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\"?"
-msgstr "Vil du sletta «%s» permanent?"
+#: ../src/cheese-main.vala:75
+#| msgid "A cheesy program to take photos and videos from your webcam"
+msgid "- Take photos and videos from your webcam"
+msgstr "â?? Ta bilete og film frÃ¥ ditt nettkamera"
-#: ../src/cheese-commands-file.c:177
+#: ../src/cheese-main.vala:86
#, c-format
-msgid "If you delete an item, it will be permanently lost."
-msgstr "Om du slettar eit element vil det vera permanent borte."
-
-#: ../src/cheese-commands-file.c:198
-msgid "Unknown Error"
-msgstr "Ukjend feil"
-
-#: ../src/cheese-commands-file.c:228
-msgid "Cannot move file to trash, do you want to delete immediately?"
+msgid "Run '%s --help' to see a full list of available command line options.\n"
msgstr ""
-"Klarte ikkje flytta fil til papirkorga. Vil du sletta henne med ein gong?"
+"Køyr «%s --help» for å sjå ei full liste over tilgjengelege "
+"kommandolinjeflagg.\n"
-#: ../src/cheese-commands-file.c:229
-#, c-format
-msgid "The file \"%s\" cannot be moved to the trash. Details: %s"
-msgstr "Fila «%s» kan ikkje flyttast til papirkorga. Detaljar: %s"
+#: ../src/cheese-window.vala:601
+#| msgid "_Stop Recording"
+msgid "Stop _Recording"
+msgstr "Stopp _opptak"
-#: ../src/cheese-commands-file.c:301
-#, c-format
-msgid "Really move all photos and videos to the trash?"
-msgstr "Vil du flytta alle bileta og filmane til papirkorga?"
+#~ msgid "Switch to Burst Mode"
+#~ msgstr "Veksla til sekvensmodus"
-#: ../src/cheese-commands-file.c:309
-msgid "_Move to Trash"
-msgstr "Flytt til _papirkorga"
+#~ msgid "Switch to Photo Mode"
+#~ msgstr "Veksla til biletmodus"
-#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:654
-msgid "Unable to open help file for Cheese"
-msgstr "Kan ikkje opna hjelp for Cheese"
+#~ msgid "Switch to Video Mode"
+#~ msgstr "Veksla til filmmodus"
-#: ../src/cheese-commands-help.c:96
-msgid "translator-credits"
-msgstr ""
-"Kjartan Maraas <kmaraas gnome org>\n"
-"Eskild Hustvedt <eskildh gnome org>\n"
-"Eirik U. Birkeland <eirbir gmail com>\n"
-"Torstein Adolf Winterseth <kvikende fsfe org>"
+#~ msgid "Switch to the Effects Selector"
+#~ msgstr "Veksla til effektveljaren"
-#: ../src/cheese-commands-help.c:99
-msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-msgstr ""
-"Dette programmet er fri programvare. Du kan vidaredistribuera og/eller endra "
-"programmet under vilkåra i GNU General Public License som utgjeven av Free "
-"Software Foundation; anten versjon 2 av lisensen, eller (dersom du ønskjer "
-"det) einkvar seinare versjon.\n"
+#~ msgid "_Skip"
+#~ msgstr "_Hopp over"
-#: ../src/cheese-commands-help.c:103
-msgid ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-msgstr ""
-"Dette programmet er distribuert i håp om at det kan vera nyttig, men UTAN "
-"NOKON GARANTI, heller ikkje med den underforståtte garantien for KURANT "
-"KVALITET eller at han er BRUKBAR FOR EIT SPESIFIKT FORMÃ?L. SOM SKILDRA I "
-"ANSVARSFR�SKRIVINGA. Sjå GNU General Public License for detaljar.\n"
+#~ msgid "S_kip All"
+#~ msgstr "H_opp over alle"
-#: ../src/cheese-commands-help.c:107
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr ""
-"Du skal ha fått ein kopi av GNU General Public License saman med dette "
-"programmet. Dersom dette ikkje er tilfelle sjå på <http://www.gnu.org/";
-"licenses/>."
-
-#: ../src/cheese-commands-help.c:124
-msgid "Cheese Website"
-msgstr "Nettstaden til Cheese"
-
-#: ../src/cheese-effect-chooser.c:60
-msgid "No Effect"
-msgstr "Ingen effekt"
-
-#: ../src/cheese-effect-chooser.c:62
-msgid "Mauve"
-msgstr "Mauve"
-
-#: ../src/cheese-effect-chooser.c:64
-msgid "Noir/Blanc"
-msgstr "Noir/Blanc"
-
-#: ../src/cheese-effect-chooser.c:68
-msgid "Hulk"
-msgstr "Hulk"
-
-#: ../src/cheese-effect-chooser.c:70
-msgid "Vertical Flip"
-msgstr "Snu loddrett"
-
-#: ../src/cheese-effect-chooser.c:72
-msgid "Horizontal Flip"
-msgstr "Snu vassrett"
+#~ msgid "Delete _All"
+#~ msgstr "Slett _alle"
-#: ../src/cheese-effect-chooser.c:74
-msgid "Shagadelic"
-msgstr "Shagadelic"
-
-#: ../src/cheese-effect-chooser.c:76
-msgid "Vertigo"
-msgstr "Vertigo"
-
-#: ../src/cheese-effect-chooser.c:78
-msgid "Edge"
-msgstr "Kant"
-
-#: ../src/cheese-effect-chooser.c:80
-msgid "Dice"
-msgstr "Terning"
-
-#: ../src/cheese-effect-chooser.c:82
-msgid "Warp"
-msgstr "Warp"
-
-#: ../src/cheese-no-camera.c:94
-msgid "No camera found!"
-msgstr "Fann ingen kamera"
+#~| msgid ""
+#~| "Failed to launch program to show:\n"
+#~| "%s"
+#~ msgid ""
+#~ "Failed to launch program to show:\n"
+#~ "%s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Klarte ikkje starta program for å visa:\n"
+#~ "%s\n"
+#~ "%s"
-#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1219
-msgid "Please refer to the help for further information."
-msgstr "Sjå hjelpedokumenta for meir informasjon."
+#~ msgid "Save File"
+#~ msgstr "Lagra fil"
-#: ../src/cheese-ui.h:32
-msgid "_Cheese"
-msgstr "_Cheese"
+#~ msgid "Could not save %s"
+#~ msgstr "Klarte ikkje lagra %s"
-#: ../src/cheese-ui.h:34
-msgid "_Edit"
-msgstr "R_ediger"
+#~ msgid "Error while deleting"
+#~ msgstr "Feil under sletting"
-#: ../src/cheese-ui.h:35
-msgid "_Help"
-msgstr "_Hjelp"
+#~| msgid "The file \"%s\" cannot be moved to the trash. Details: %s"
+#~ msgid "The file \"%s\" cannot be deleted. Details: %s"
+#~ msgstr "Fila «%s» kan ikkje slettast. Detaljar: %s"
-#: ../src/cheese-ui.h:38
-msgid "_Contents"
-msgstr "_Innhald"
+#~ msgid "Are you sure you want to permanently delete the %'d selected item?"
+#~ msgid_plural ""
+#~ "Are you sure you want to permanently delete the %'d selected items?"
+#~ msgstr[0] "Vil du sletta det valde elementet permanent?"
+#~ msgstr[1] "Vil du sletta dei %'d valde elementa permanent?"
-#: ../src/cheese-ui.h:38
-msgid "Help on this Application"
-msgstr "Hjelp til dette programmet"
+#~ msgid "Are you sure you want to permanently delete \"%s\"?"
+#~ msgstr "Vil du sletta «%s» permanent?"
-#: ../src/cheese-ui.h:48
-msgid "_Photo"
-msgstr "_Bilete"
+#~ msgid "If you delete an item, it will be permanently lost."
+#~ msgstr "Om du slettar eit element vil det vera permanent borte."
-#: ../src/cheese-ui.h:49
-msgid "_Video"
-msgstr "_Film"
+#~ msgid "Unknown Error"
+#~ msgstr "Ukjend feil"
-#: ../src/cheese-ui.h:50
-msgid "_Burst"
-msgstr "_Sekvens"
+#~ msgid "Cannot move file to trash, do you want to delete immediately?"
+#~ msgstr ""
+#~ "Klarte ikkje flytta fil til papirkorga. Vil du sletta henne med ein gong?"
-#: ../src/cheese-ui.h:54
-msgid "Countdown"
-msgstr "Bruk nedteljing"
+#~ msgid "The file \"%s\" cannot be moved to the trash. Details: %s"
+#~ msgstr "Fila «%s» kan ikkje flyttast til papirkorga. Detaljar: %s"
-#: ../src/cheese-ui.h:64
-#| msgid "_Video"
-msgid "_Wide mode"
-msgstr "_Vid modus"
+#~ msgid "Really move all photos and videos to the trash?"
+#~ msgstr "Vil du flytta alle bileta og filmane til papirkorga?"
-#: ../src/cheese-ui.h:71
-msgid "_Recording"
-msgstr "_Opptak"
+#~ msgid "_Move to Trash"
+#~ msgstr "Flytt til _papirkorga"
-#: ../src/cheese-ui.h:74 ../src/cheese-window.c:62
-#| msgid "_Take a Photo"
-msgid "_Take multiple Photos"
-msgstr "_Ta fleire bilete"
+#~ msgid "Unable to open help file for Cheese"
+#~ msgstr "Kan ikkje opna hjelp for Cheese"
-#: ../src/cheese-ui.h:78
-msgid "_Open"
-msgstr "_Opna"
+#~ msgid ""
+#~ "This program is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ msgstr ""
+#~ "Dette programmet er fri programvare. Du kan vidaredistribuera og/eller "
+#~ "endra programmet under vilkåra i GNU General Public License som utgjeven "
+#~ "av Free Software Foundation; anten versjon 2 av lisensen, eller (dersom "
+#~ "du ønskjer det) einkvar seinare versjon.\n"
-#: ../src/cheese-ui.h:80
-#| msgid "Save _As..."
-msgid "Save _Asâ?¦"
-msgstr "L_agra som â?¦"
+#~ msgid ""
+#~ "This program is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General "
+#~ "Public License for more details.\n"
+#~ msgstr ""
+#~ "Dette programmet er distribuert i håp om at det kan vera nyttig, men UTAN "
+#~ "NOKON GARANTI, heller ikkje med den underforståtte garantien for KURANT "
+#~ "KVALITET eller at han er BRUKBAR FOR EIT SPESIFIKT FORMÃ?L. SOM SKILDRA I "
+#~ "ANSVARSFR�SKRIVINGA. Sjå GNU General Public License for detaljar.\n"
-#: ../src/cheese-ui.h:82
-msgid "Move to _Trash"
-msgstr "Flytt til _papirkorga"
+#~ msgid ""
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with this program. If not, see <http://www.gnu.org/licenses/>."
+#~ msgstr ""
+#~ "Du skal ha fått ein kopi av GNU General Public License saman med dette "
+#~ "programmet. Dersom dette ikkje er tilfelle sjå på <http://www.gnu.org/";
+#~ "licenses/>."
-#: ../src/cheese-ui.h:84
-msgid "Delete"
-msgstr "Slett"
+#~ msgid "Vertical Flip"
+#~ msgstr "Snu loddrett"
-#: ../src/cheese-ui.h:89
-msgid "Move All to Trash"
-msgstr "Flytt alle til papirkorga"
+#~ msgid "Horizontal Flip"
+#~ msgstr "Snu vassrett"
-#: ../src/cheese-window.c:60
-msgid "_Start Recording"
-msgstr "_Start opptak"
+#~ msgid "No camera found!"
+#~ msgstr "Fann ingen kamera"
-#: ../src/cheese-window.c:61
-msgid "_Stop Recording"
-msgstr "_Stopp opptak"
+#~ msgid "Please refer to the help for further information."
+#~ msgstr "Sjå hjelpedokumenta for meir informasjon."
-#: ../src/cheese.c:96
-msgid "Be verbose"
-msgstr "Gje mykje informasjon"
+#~ msgid "Help on this Application"
+#~ msgstr "Hjelp til dette programmet"
-#: ../src/cheese.c:98
-msgid "Enable wide mode"
-msgstr "Slå på vid modus"
+#~ msgid "Countdown"
+#~ msgstr "Bruk nedteljing"
-#: ../src/cheese.c:100
-msgid "output version information and exit"
-msgstr "skriv ut versjoninformasjon og avslutt"
+#~ msgid "_Start Recording"
+#~ msgstr "_Start opptak"
-#: ../src/cheese.c:115
-msgid "- Take photos and videos with your webcam, with fun graphical effects"
-msgstr ""
-"- Ta bilete og ta opp film med nettkameraet ditt, med morosame grafiske "
-"effektar"
+#~ msgid ""
+#~ "- Take photos and videos with your webcam, with fun graphical effects"
+#~ msgstr ""
+#~ "- Ta bilete og ta opp film med nettkameraet ditt, med morosame grafiske "
+#~ "effektar"
#~ msgid "The Y resolution of the image captured from the camera"
#~ msgstr "Y-oppløysinga til biletet frå kameraet"
@@ -663,14 +707,5 @@ msgstr ""
#~ msgid "Export to _Flickr"
#~ msgstr "Eksporter til _Flickr"
-#~ msgid "Quit"
-#~ msgstr "Avslutt"
-
-#~ msgid "About"
-#~ msgstr "Om"
-
-#~ msgid "A cheesy program to take photos and videos from your webcam"
-#~ msgstr "Program for å ta bilete og film frå ditt vevkamera"
-
#~ msgid "_Back"
#~ msgstr "Til_bake"
diff --git a/po/pa.po b/po/pa.po
index 002e9b7..3821981 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -8,18 +8,18 @@ msgid ""
msgstr ""
"Project-Id-Version: cheese.HEAD\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=cheese&component=general\n";
-"POT-Creation-Date: 2010-08-02 22:10+0000\n"
-"PO-Revision-Date: 2010-08-04 14:06+0530\n"
+"POT-Creation-Date: 2010-10-03 21:49+0000\n"
+"PO-Revision-Date: 2010-10-04 07:23+0530\n"
"Last-Translator: A S Alam <aalam users sf net>\n"
"Language-Team: Punjabi/Panjabi <punjabi-users lists sf net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.1\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: ../data/cheese-about.ui.h:1 ../data/cheese.desktop.in.in.h:1
-#: ../src/cheese-main.vala:105
+#: ../src/cheese-main.vala:102
msgid "Cheese"
msgstr "���਼"
@@ -64,17 +64,14 @@ msgstr ""
"ਪੰ�ਾਬ� �ਪਨ ਸ�ਰਸ ��ਮ"
#: ../data/cheese-actions.ui.h:1
-#| msgid "_Burst"
msgid "Burst"
msgstr "ਬਰੱਸ�"
#: ../data/cheese-actions.ui.h:2
-#| msgid "_Leave Fullscreen"
msgid "Fullscreen"
msgstr "ਪ�ਰ� ਸ�ਰ�ਨ"
#: ../data/cheese-actions.ui.h:3
-#| msgid "_Contents"
msgid "Help _Contents"
msgstr "ਮੱਦਦ ਸਮੱ�ਰ�(_C)"
@@ -87,27 +84,22 @@ msgid "Move to _Trash"
msgstr "ਰੱਦ� '� ਸ�ੱ��(_T)"
#: ../data/cheese-actions.ui.h:6
-#| msgid "No Effect"
msgid "Next Effects"
msgstr "à¨?à¨?ਲਾ ਪਰà¨à¨¾à¨µ"
#: ../data/cheese-actions.ui.h:7
-#| msgid "No Effect"
msgid "Previous Effects"
msgstr "ਪਿà¨?ਲਾ ਪਰà¨à¨¾à¨µ"
#: ../data/cheese-actions.ui.h:8
-#| msgid "Save _Asâ?¦"
msgid "Save _As"
msgstr "à¨?à©°à¨? ਸੰà¨à¨¾à¨²à©?(_A)"
#: ../data/cheese-actions.ui.h:9
-#| msgid "_Take multiple Photos"
msgid "Take _Multiple Photos"
msgstr "�� ਫ��� ਲਵ�(_M)"
#: ../data/cheese-actions.ui.h:10
-#| msgid "About"
msgid "_About"
msgstr "�ਸ ਬਾਰ�(_A)"
@@ -116,7 +108,6 @@ msgid "_Cheese"
msgstr "���਼(_C)"
#: ../data/cheese-actions.ui.h:12
-#| msgid "Delete"
msgid "_Delete"
msgstr "ਹ�ਾ�(_D)"
@@ -141,17 +132,14 @@ msgid "_Photo"
msgstr "ਫ���(_P)"
#: ../data/cheese-actions.ui.h:18
-#| msgid "Preferences"
msgid "_Preferences"
msgstr "ਮ�ਰ� ਪਸੰਦ(_P)"
#: ../data/cheese-actions.ui.h:19
-#| msgid "Quit"
msgid "_Quit"
msgstr "ਬੰਦ �ਰ�(_Q)"
#: ../data/cheese-actions.ui.h:20
-#| msgid "_Recording"
msgid "_Record a Video"
msgstr "ਵਿਡ�� ਰਿ�ਾਰਡ �ਰ�(_R)"
@@ -164,7 +152,6 @@ msgid "_Video"
msgstr "ਵਿਡ��(_V)"
#: ../data/cheese-actions.ui.h:23
-#| msgid "_Wide mode"
msgid "_Wide Mode"
msgstr "ਵਾ�ਡ ਮ�ਡ(_W)"
@@ -371,45 +358,45 @@ msgstr "�� ਵਾ�ਡ ਮ�ਡ ਸ਼�ਰ� �ਰਨਾ ਹ�"
msgid "Width resolution"
msgstr "���ਾ� ਰ��਼�ਲ�ਸ਼ਨ"
-#: ../libcheese/cheese-avatar-chooser.c:110
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.vala:594
msgid "Shutter sound"
msgstr "ਸ਼�ਰ ਸਾ��ਡ"
-#: ../libcheese/cheese-avatar-chooser.c:236
+#: ../libcheese/cheese-avatar-chooser.c:238
msgid "Take a photo"
msgstr "ਫ��� ਲਵ�"
-#: ../libcheese/cheese-avatar-chooser.c:255
+#: ../libcheese/cheese-avatar-chooser.c:257
msgid "_Take a photo"
msgstr "ਫ��� ਲਵ�(_T)"
-#: ../libcheese/cheese-avatar-chooser.c:270
+#: ../libcheese/cheese-avatar-chooser.c:272
msgid "_Discard photo"
msgstr "ਫ��� �ਣਡਿੱਠ�(_D)"
-#: ../libcheese/cheese-camera-device.c:328
+#: ../libcheese/cheese-camera-device.c:329
msgid "Device capabilities not supported"
msgstr "�ੰਤਰ ਸਹ�ਲਤ ਸਹਾ�� ਨਹ��"
-#: ../libcheese/cheese-camera-device.c:352
+#: ../libcheese/cheese-camera-device.c:357
#, c-format
msgid "Failed to initialize device %s for capability probing"
msgstr "ਸਮੱਰਥਾ �ਾਣਨ ਲ� �ੰਤਰ %s ਸ਼�ਰ� �ਰਨ ਲ� ਫ�ਲ�ਹ"
-#: ../libcheese/cheese-camera-device.c:510
+#: ../libcheese/cheese-camera-device.c:515
msgid "Unknown device"
msgstr "�ਣ�ਾਣ �ੰਤਰ"
-#: ../libcheese/cheese-camera-device.c:534
+#: ../libcheese/cheese-camera-device.c:539
msgid "Cancellable initialization not supported"
msgstr "ਰੱਦ �ਰਨ ਯ�� ਸ਼�ਰ��ਤ ਸਹਾ�� ਨਹ�� ਹ�"
-#: ../libcheese/cheese-camera.c:1128
+#: ../libcheese/cheese-camera.c:1156
#, c-format
msgid "No device found"
msgstr "��� �ੰਤਰ ਨਹ�� ਮਿਲਿ�"
-#: ../libcheese/cheese-camera.c:1147
+#: ../libcheese/cheese-camera.c:1175
msgid "One or more needed GStreamer elements are missing: "
msgstr "ਲà©?à©?à©?ਦà©? à¨?ੱà¨? à¨?ਾà¨? ਹà©?ਰ à¨?à©?-ਸà¨?ਰà©?ਮਰ à¨à¨¾à¨? à¨?à©?ੰਮ ਹਨ: "
@@ -425,40 +412,47 @@ msgstr "ਲ���ਦ� �ੱ� �ਾ� ਹ�ਰ ��-ਸ�ਰ�ਮ
msgid "%d "
msgstr "%d "
-#: ../src/cheese-main.vala:38
-msgid "Be verbose"
-msgstr "�ਾਣ�ਾਰ� ਵਧਾ�"
+#: ../src/cheese-effects-manager.vala:116
+#| msgid "Next Effects"
+msgid "No Effect"
+msgstr "ਪਰà¨à¨¾à¨µ ਨਹà©?à¨?"
-#: ../src/cheese-main.vala:39
+#: ../src/cheese-main.vala:37
msgid "Enable wide mode"
msgstr "ਵਾ�ਡ ਮ�ਡ �ਾਲ�"
-#: ../src/cheese-main.vala:40
-#| msgid "output version information and exit"
+#: ../src/cheese-main.vala:38
+msgid "Device to use as a camera"
+msgstr "��ਮਰ� ਵ��� ਵਰਤਣ ਲ� �ੰਤਰ"
+
+#: ../src/cheese-main.vala:38
+msgid "DEVICE"
+msgstr "�ੰਤਰ"
+
+#: ../src/cheese-main.vala:39
msgid "Output version information and exit"
msgstr "ਵਰ�ਨ �ਾਣ�ਾਰ� ਦਿ� �ਤ� ਬੰਦ �ਰ�"
-#: ../src/cheese-main.vala:75
-#| msgid ""
-#| "- Take photos and videos with your webcam, with fun graphical effects"
+#: ../src/cheese-main.vala:66
msgid "- Take photos and videos from your webcam"
msgstr "- �ਪਣ� ਵ�ੱਬ��ਮ ਨਾਲ ਫ��� ਲਵ� �ਤ� ਵਿਡ�� ਬਣਾ�"
-#: ../src/cheese-main.vala:86
+#: ../src/cheese-main.vala:77
#, c-format
msgid "Run '%s --help' to see a full list of available command line options.\n"
msgstr "�ਪਲੱਬਧ �ਮਾ�ਡ ਲਾ�ਨ ��ਣਾ� ਦ� ਪ�ਰ� ਲਿਸ� ਵ��ਣ ਲ� '%s --help' �ਲਾ�।\n"
-#: ../src/cheese-window.vala:604
-#| msgid "_Stop Recording"
+#: ../src/cheese-window.vala:689
msgid "Stop _Recording"
msgstr "ਰਿ�ਾਰਡਿੰ� ਰ���(_S)"
-#: ../src/cheese-window.vala:723
-#| msgid "No device found"
+#: ../src/cheese-window.vala:821
msgid "No effects found"
msgstr "à¨?à©?à¨? ਪਰà¨à¨¾à¨µ ਨਹà©?à¨? ਲੱà¨à¨¿à¨?"
+#~ msgid "Be verbose"
+#~ msgstr "�ਾਣ�ਾਰ� ਵਧਾ�"
+
#~ msgid "Switch to Burst Mode"
#~ msgstr "ਬਰੱਸ� ਮ�ਡ ਲ� ਬਦਲ�"
diff --git a/po/pl.po b/po/pl.po
index 72675d1..ffc3cee 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: cheese\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-20 22:13+0100\n"
-"PO-Revision-Date: 2010-02-20 20:26+0100\n"
-"Last-Translator: Piotr DrÄ?g <piotrdrag gmail com>\n"
+"POT-Creation-Date: 2010-09-07 18:32+0200\n"
+"PO-Revision-Date: 2010-09-07 18:31+0100\n"
+"Last-Translator: Tomasz Dominikowski <dominikowski gmail com>\n"
"Language-Team: Polish <gnomepl aviary pl>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
"X-Poedit-Language: Polish\n"
"X-Poedit-Country: Poland\n"
-#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:113
+#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:118
msgid "Cheese"
msgstr "Cheese"
@@ -144,45 +144,55 @@ msgstr ""
"zdjÄ?cia"
#: ../data/cheese.schemas.in.h:23
+msgid "Set to True to use flash when taking a photo"
+msgstr ""
+"JeÅ?li ustawione na \"true\", bÄ?dzie używany efekt lampy bÅ?yskowej przez "
+"zrobieniem zdjÄ?cia"
+
+#: ../data/cheese.schemas.in.h:24
msgid "The device which points to the camera (e.g. /dev/video0)"
msgstr "CiÄ?g urzÄ?dzenia, który wskazuje na kamerÄ? (np. /dev/video0)"
-#: ../data/cheese.schemas.in.h:24
+#: ../data/cheese.schemas.in.h:25
msgid "The height resolution of the image captured from the camera"
msgstr "RozdzielczoÅ?Ä? przechwytywanego obrazu w poziomie"
-#: ../data/cheese.schemas.in.h:25
+#: ../data/cheese.schemas.in.h:26
msgid ""
"The length of time, in milliseconds, to delay between taking each photo in a "
"burst sequence of photos."
msgstr ""
"OdstÄ?p czasu pomiÄ?dzy zdjÄ?ciami w trybie zdjÄ?Ä? seryjnych, w milisekundach."
-#: ../data/cheese.schemas.in.h:26
+#: ../data/cheese.schemas.in.h:27
msgid "The number of photos to take in a single burst."
msgstr "Liczba zdjÄ?Ä? do zrobienia w pojedynczej serii."
-#: ../data/cheese.schemas.in.h:27
+#: ../data/cheese.schemas.in.h:28
msgid "The width resolution of the image captured from the camera"
msgstr "RozdzielczoÅ?Ä? przechwytywanego obrazu w pionie"
-#: ../data/cheese.schemas.in.h:28
+#: ../data/cheese.schemas.in.h:29
msgid "Use a countdown"
msgstr "Odliczanie"
-#: ../data/cheese.schemas.in.h:29
+#: ../data/cheese.schemas.in.h:30
+msgid "Use a flash"
+msgstr "Lampa bÅ?yskowa"
+
+#: ../data/cheese.schemas.in.h:31
msgid "Video Path"
msgstr "Å?cieżka do nagraÅ? wideo"
-#: ../data/cheese.schemas.in.h:30
+#: ../data/cheese.schemas.in.h:32
msgid "Whether to enable immediate deletion"
msgstr "OkreÅ?la, czy wÅ?Ä?czyÄ? bezpowrotne usuwanie"
-#: ../data/cheese.schemas.in.h:31
+#: ../data/cheese.schemas.in.h:33
msgid "Whether to start in wide mode"
msgstr "OkreÅ?la, czy uruchamiaÄ? w trybie szerokim"
-#: ../data/cheese.schemas.in.h:32
+#: ../data/cheese.schemas.in.h:34
msgid "Width resolution"
msgstr "RozdzielczoÅ?Ä? w poziomie"
@@ -202,7 +212,7 @@ msgstr "PrzeÅ?Ä?cza do trybu wideo"
msgid "Switch to the Effects Selector"
msgstr "PrzeÅ?Ä?cza do wyboru efektów"
-#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:55 ../src/cheese-window.c:865
+#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:61 ../src/cheese-window.c:884
msgid "_Effects"
msgstr "Efe_kty"
@@ -210,7 +220,7 @@ msgstr "Efe_kty"
msgid "_Leave Fullscreen"
msgstr "_OpuÅ?Ä? tryb peÅ?noekranowy"
-#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:66 ../src/cheese-window.c:59
+#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:72 ../src/cheese-window.c:59
msgid "_Take a Photo"
msgstr "Zrób z_djÄ?cie"
@@ -246,7 +256,7 @@ msgstr "WÅ?aÅ?ciwoÅ?ci obrazu"
msgid "Number of photos"
msgstr "Liczba zdjÄ?Ä?"
-#: ../data/cheese-prefs.ui.h:9 ../src/cheese-ui.h:35
+#: ../data/cheese-prefs.ui.h:9 ../src/cheese-ui.h:44
msgid "Preferences"
msgstr "Preferencje"
@@ -263,40 +273,40 @@ msgstr "Nasycenie"
msgid "Webcam"
msgstr "Kamera"
-#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:626
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:640
msgid "Shutter sound"
msgstr "DźwiÄ?k migawki"
-#: ../libcheese/cheese-avatar-chooser.c:222
+#: ../libcheese/cheese-avatar-chooser.c:236
msgid "Take a photo"
msgstr "Zrób zdjÄ?cie"
-#: ../libcheese/cheese-avatar-chooser.c:241
+#: ../libcheese/cheese-avatar-chooser.c:255
msgid "_Take a photo"
msgstr "Zrób z_djÄ?cie"
-#: ../libcheese/cheese-avatar-chooser.c:256
+#: ../libcheese/cheese-avatar-chooser.c:270
msgid "_Discard photo"
msgstr "_OdrzuÄ? zdjÄ?cie"
-#: ../libcheese/cheese-camera-device.c:327
+#: ../libcheese/cheese-camera-device.c:328
msgid "Device capabilities not supported"
msgstr "NieobsÅ?ugiwane możliwoÅ?ci urzÄ?dzenia"
-#: ../libcheese/cheese-camera-device.c:488
+#: ../libcheese/cheese-camera-device.c:510
msgid "Unknown device"
msgstr "Nieznane urzÄ?dzenie"
-#: ../libcheese/cheese-camera-device.c:512
+#: ../libcheese/cheese-camera-device.c:534
msgid "Cancellable initialization not supported"
msgstr "NieobsÅ?ugiwane inicjowanie możliwe do anulowania"
-#: ../libcheese/cheese-camera.c:1134
+#: ../libcheese/cheese-camera.c:1139
#, c-format
msgid "No device found"
msgstr "Nie odnaleziono kamery"
-#: ../libcheese/cheese-camera.c:1153
+#: ../libcheese/cheese-camera.c:1158
msgid "One or more needed GStreamer elements are missing: "
msgstr "Brak jednego lub wiÄ?cej elementów GStreamer: "
@@ -306,16 +316,12 @@ msgstr "Brak jednego lub wiÄ?cej elementów GStreamer: "
#. * To enable to show the numbers in your own language, use %Id instead.
#. * Please leave the additional whitespace after the number
#.
-#: ../libcheese/cheese-countdown.c:436 ../libcheese/cheese-countdown.c:455
-#: ../libcheese/cheese-countdown.c:474
+#: ../libcheese/cheese-countdown.c:441 ../libcheese/cheese-countdown.c:460
+#: ../libcheese/cheese-countdown.c:479
#, c-format
msgid "%d "
msgstr "%d "
-#: ../libcheese/cheese-widget.c:289 ../libcheese/cheese-widget.c:391
-msgid "Camera setup failed"
-msgstr "Ustawienie kamery nie powiodÅ?o siÄ?"
-
#: ../src/cheese-commands-file.c:31
msgid "_Skip"
msgstr "_PomiÅ?"
@@ -398,7 +404,7 @@ msgstr "Na pewno przenieÅ?Ä? wszystkie zdjÄ?cia i nagrania wideo do kosza?"
msgid "_Move to Trash"
msgstr "_PrzenieÅ? do kosza"
-#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:649
+#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:662
msgid "Unable to open help file for Cheese"
msgstr "Nie można otworzyÄ? pliku pomocy programu Cheese"
@@ -488,11 +494,11 @@ msgstr "Kostka"
msgid "Warp"
msgstr "Deformacja"
-#: ../src/cheese-no-camera.c:93
+#: ../src/cheese-no-camera.c:94
msgid "No camera found!"
msgstr "Nie odnaleziono kamery."
-#: ../src/cheese-no-camera.c:94
+#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1258
msgid "Please refer to the help for further information."
msgstr "ProszÄ? zajrzeÄ? do pomocy, aby uzyskaÄ? wiÄ?cej informacji."
@@ -504,63 +510,67 @@ msgstr "_Cheese"
msgid "_Edit"
msgstr "_Edycja"
-#: ../src/cheese-ui.h:37
+#: ../src/cheese-ui.h:35
msgid "_Help"
msgstr "_Pomoc"
-#: ../src/cheese-ui.h:40
+#: ../src/cheese-ui.h:38
msgid "_Contents"
msgstr "_Spis treÅ?ci"
-#: ../src/cheese-ui.h:40
+#: ../src/cheese-ui.h:38
msgid "Help on this Application"
msgstr "Pomoc programu"
-#: ../src/cheese-ui.h:46
+#: ../src/cheese-ui.h:48
msgid "_Photo"
msgstr "_ZdjÄ?cie"
-#: ../src/cheese-ui.h:47
+#: ../src/cheese-ui.h:49
msgid "_Video"
msgstr "_Wideo"
-#: ../src/cheese-ui.h:48
+#: ../src/cheese-ui.h:50
msgid "_Burst"
msgstr "ZdjÄ?cia _seryjne"
-#: ../src/cheese-ui.h:52
+#: ../src/cheese-ui.h:54
msgid "Countdown"
msgstr "Odliczanie"
-#: ../src/cheese-ui.h:62
+#: ../src/cheese-ui.h:57
+msgid "Flash"
+msgstr "Lampa bÅ?yskowa"
+
+#: ../src/cheese-ui.h:68
msgid "_Wide mode"
msgstr "_Tryb szeroki"
-#: ../src/cheese-ui.h:69
+#: ../src/cheese-ui.h:75
msgid "_Recording"
msgstr "Rozpocznij _nagrywanie"
-#: ../src/cheese-ui.h:72 ../src/cheese-window.c:62
+#: ../src/cheese-ui.h:78 ../src/cheese-window.c:62
msgid "_Take multiple Photos"
msgstr "Zrób wiele z_djÄ?Ä?"
-#: ../src/cheese-ui.h:76
+#: ../src/cheese-ui.h:82
msgid "_Open"
msgstr "_Otwórz"
-#: ../src/cheese-ui.h:78
+#: ../src/cheese-ui.h:84
msgid "Save _Asâ?¦"
msgstr "Z_apisz jakoâ?¦"
-#: ../src/cheese-ui.h:80
+#: ../src/cheese-ui.h:86
msgid "Move to _Trash"
msgstr "_PrzenieÅ? do kosza"
-#: ../src/cheese-ui.h:82
+#: ../src/cheese-ui.h:88
msgid "Delete"
msgstr "UsuÅ?"
-#: ../src/cheese-ui.h:87
+#: ../src/cheese-ui.h:93
msgid "Move All to Trash"
msgstr "PrzenieÅ? wszystko do kosza"
@@ -572,19 +582,19 @@ msgstr "_Rozpocznij nagrywanie"
msgid "_Stop Recording"
msgstr "Zatrzymaj _nagrywanie"
-#: ../src/cheese.c:96
+#: ../src/cheese.c:97
msgid "Be verbose"
msgstr "WiÄ?cej komunikatów"
-#: ../src/cheese.c:98
+#: ../src/cheese.c:99
msgid "Enable wide mode"
msgstr "WÅ?Ä?cza tryb szeroki"
-#: ../src/cheese.c:100
+#: ../src/cheese.c:101
msgid "output version information and exit"
msgstr "wyÅ?wietla informacje o wersji i koÅ?czy dziaÅ?anie"
-#: ../src/cheese.c:115
+#: ../src/cheese.c:120
msgid "- Take photos and videos with your webcam, with fun graphical effects"
msgstr ""
"- Robienie zdjÄ?Ä? i nagrywanie filmów z zabawnymi efektami graficznymi za "
diff --git a/po/pt.po b/po/pt.po
index 4ceccae..7b5f0e6 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,10 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 2.30\n"
+"Project-Id-Version: 2.32\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-02 01:13+0000\n"
-"PO-Revision-Date: 2010-03-02 01:15+0100\n"
+"POT-Creation-Date: 2010-09-10 23:26+0100\n"
+"PO-Revision-Date: 2010-09-10 23:25+0100\n"
"Last-Translator: Duarte Loreto <happyguy_pt hotmail com>\n"
"Language-Team: Portuguese <gnome_pt yahoogroups com>\n"
"MIME-Version: 1.0\n"
@@ -17,20 +17,197 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:113
+#: ../data/cheese-about.ui.h:1 ../data/cheese.desktop.in.in.h:1
+#: ../src/cheese-main.vala:102
msgid "Cheese"
msgstr "Cheese"
-#: ../data/cheese.desktop.in.in.h:2
-msgid "Cheese Webcam Booth"
-msgstr "Cabine Fotográfica Cheese"
+#: ../data/cheese-about.ui.h:2
+msgid "Cheese Website"
+msgstr "Página do Cheese"
-#: ../data/cheese.desktop.in.in.h:3 ../src/cheese-commands-help.c:118
+#: ../data/cheese-about.ui.h:3 ../data/cheese.desktop.in.in.h:3
msgid "Take photos and videos with your webcam, with fun graphical effects"
msgstr ""
"Tire fotografias e grave vÃdeos com a sua webcam, com engraçados efeitos "
"gráficos"
+#: ../data/cheese-about.ui.h:4
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see http://www.gnu.org/licenses/\n";
+msgstr ""
+
+#: ../data/cheese-about.ui.h:10
+msgid "translator-credits"
+msgstr ""
+"Duarte Loreto <happyguy_pt hotmail com>, 2008, 2009, 2010\n"
+"Miguel Pires da Rosa <miguelpires gmail com>, 2007"
+
+#: ../data/cheese-actions.ui.h:1
+#, fuzzy
+msgid "Burst"
+msgstr "_Rajada"
+
+#: ../data/cheese-actions.ui.h:2
+msgid "Fullscreen"
+msgstr "Ecrã Completo"
+
+#: ../data/cheese-actions.ui.h:3
+#, fuzzy
+msgid "Help _Contents"
+msgstr "_Conteúdo"
+
+#: ../data/cheese-actions.ui.h:4
+msgid "Move All to Trash"
+msgstr "Mover Tudo para o Lixo"
+
+#: ../data/cheese-actions.ui.h:5
+msgid "Move to _Trash"
+msgstr "Mover para o _Lixo"
+
+#: ../data/cheese-actions.ui.h:6
+msgid "Next Effects"
+msgstr "Efeitos Seguintes"
+
+#: ../data/cheese-actions.ui.h:7
+msgid "Previous Effects"
+msgstr "Efeitos Anteriores"
+
+#: ../data/cheese-actions.ui.h:8
+#, fuzzy
+msgid "Save _As"
+msgstr "Gravar _Comoâ?¦"
+
+#: ../data/cheese-actions.ui.h:9
+#, fuzzy
+msgid "Take _Multiple Photos"
+msgstr "_Tirar múltiplas Fotografias"
+
+#: ../data/cheese-actions.ui.h:10
+msgid "_About"
+msgstr "_Sobre"
+
+#: ../data/cheese-actions.ui.h:11
+msgid "_Cheese"
+msgstr "_Cheese"
+
+#: ../data/cheese-actions.ui.h:12
+#, fuzzy
+msgid "_Delete"
+msgstr "Apagar"
+
+#: ../data/cheese-actions.ui.h:13
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../data/cheese-actions.ui.h:14 ../data/cheese-main-window.ui.h:1
+msgid "_Effects"
+msgstr "_Efeitos"
+
+#: ../data/cheese-actions.ui.h:15
+msgid "_Help"
+msgstr "_Ajuda"
+
+#: ../data/cheese-actions.ui.h:16
+msgid "_Open"
+msgstr "_Abrir"
+
+#: ../data/cheese-actions.ui.h:17
+msgid "_Photo"
+msgstr "_Foto"
+
+#: ../data/cheese-actions.ui.h:18
+msgid "_Preferences"
+msgstr "_Preferências"
+
+#: ../data/cheese-actions.ui.h:19
+msgid "_Quit"
+msgstr "_Sair"
+
+#: ../data/cheese-actions.ui.h:20
+msgid "_Record a Video"
+msgstr "_Gravar um VÃdeo"
+
+#: ../data/cheese-actions.ui.h:21 ../data/cheese-main-window.ui.h:3
+msgid "_Take a Photo"
+msgstr "_Tirar uma Fotografia"
+
+#: ../data/cheese-actions.ui.h:22
+msgid "_Video"
+msgstr "_VÃdeo"
+
+#: ../data/cheese-actions.ui.h:23
+#, fuzzy
+msgid "_Wide Mode"
+msgstr "Modo _estendido"
+
+#: ../data/cheese-main-window.ui.h:2
+msgid "_Leave Fullscreen"
+msgstr "_Manter em Ecrã Completo"
+
+#: ../data/cheese-prefs.ui.h:1
+msgid "Brightness"
+msgstr "Brilho"
+
+#: ../data/cheese-prefs.ui.h:2
+msgid "Burst mode"
+msgstr "Modo de rajada"
+
+#: ../data/cheese-prefs.ui.h:3
+msgid "Contrast"
+msgstr "Contraste"
+
+#: ../data/cheese-prefs.ui.h:4
+msgid "Delay between photos (seconds)"
+msgstr "Demora entre fotos (segundos)"
+
+#: ../data/cheese-prefs.ui.h:5
+msgid "Device"
+msgstr "Dispositivo"
+
+#: ../data/cheese-prefs.ui.h:6
+msgid "Hue"
+msgstr "Cor"
+
+#: ../data/cheese-prefs.ui.h:7
+msgid "Image properties"
+msgstr "Propriedades da imagem"
+
+#: ../data/cheese-prefs.ui.h:8
+msgid "Number of photos"
+msgstr "Número de fotos"
+
+#: ../data/cheese-prefs.ui.h:9
+msgid "Preferences"
+msgstr "Preferências"
+
+#: ../data/cheese-prefs.ui.h:10
+msgid "Resolution"
+msgstr "Resolução"
+
+#: ../data/cheese-prefs.ui.h:11
+msgid "Saturation"
+msgstr "Saturação"
+
+#: ../data/cheese-prefs.ui.h:12
+msgid "Webcam"
+msgstr "Webcam"
+
+#: ../data/cheese.desktop.in.in.h:2
+msgid "Cheese Webcam Booth"
+msgstr "Cabine Fotográfica Cheese"
+
#. Translators: please note, that the effect names are
#. standarized and should not be translated
#: ../data/cheese.schemas.in.h:3
@@ -183,116 +360,45 @@ msgstr "Se iniciar ou não em modo extendido"
msgid "Width resolution"
msgstr "Resolução de largura"
-#: ../data/cheese.ui.h:1
-msgid "Switch to Burst Mode"
-msgstr "Alternar para Modo de Rajada"
-
-#: ../data/cheese.ui.h:2
-msgid "Switch to Photo Mode"
-msgstr "Alternar para Modo de Fotografia"
-
-#: ../data/cheese.ui.h:3
-msgid "Switch to Video Mode"
-msgstr "Alternar para Modo de VÃdeo"
-
-#: ../data/cheese.ui.h:4
-msgid "Switch to the Effects Selector"
-msgstr "Alternar para o Selector de Efeitos"
-
-#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:57 ../src/cheese-window.c:869
-msgid "_Effects"
-msgstr "_Efeitos"
-
-#: ../data/cheese.ui.h:6
-msgid "_Leave Fullscreen"
-msgstr "_Manter em Ecrã Completo"
-
-#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:68 ../src/cheese-window.c:59
-msgid "_Take a Photo"
-msgstr "_Tirar uma Fotografia"
-
-#: ../data/cheese-prefs.ui.h:1
-msgid "Brightness"
-msgstr "Brilho"
-
-#: ../data/cheese-prefs.ui.h:2
-msgid "Burst mode"
-msgstr "Modo de rajada"
-
-#: ../data/cheese-prefs.ui.h:3
-msgid "Contrast"
-msgstr "Contraste"
-
-#: ../data/cheese-prefs.ui.h:4
-msgid "Delay between photos (seconds)"
-msgstr "Demora entre fotos (segundos)"
-
-#: ../data/cheese-prefs.ui.h:5
-msgid "Device"
-msgstr "Dispositivo"
-
-#: ../data/cheese-prefs.ui.h:6
-msgid "Hue"
-msgstr "Cor"
-
-#: ../data/cheese-prefs.ui.h:7
-msgid "Image properties"
-msgstr "Propriedades da imagem"
-
-#: ../data/cheese-prefs.ui.h:8
-msgid "Number of photos"
-msgstr "Número de fotos"
-
-#: ../data/cheese-prefs.ui.h:9 ../src/cheese-ui.h:44
-msgid "Preferences"
-msgstr "Preferências"
-
-#: ../data/cheese-prefs.ui.h:10
-msgid "Resolution"
-msgstr "Resolução"
-
-#: ../data/cheese-prefs.ui.h:11 ../src/cheese-effect-chooser.c:66
-msgid "Saturation"
-msgstr "Saturação"
-
-#: ../data/cheese-prefs.ui.h:12
-msgid "Webcam"
-msgstr "Webcam"
-
-#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:632
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.vala:594
msgid "Shutter sound"
msgstr "Som do obturador"
-#: ../libcheese/cheese-avatar-chooser.c:236
+#: ../libcheese/cheese-avatar-chooser.c:238
msgid "Take a photo"
msgstr "Tirar uma fotografia"
-#: ../libcheese/cheese-avatar-chooser.c:255
+#: ../libcheese/cheese-avatar-chooser.c:257
msgid "_Take a photo"
msgstr "_Tirar uma fotografia"
-#: ../libcheese/cheese-avatar-chooser.c:270
+#: ../libcheese/cheese-avatar-chooser.c:272
msgid "_Discard photo"
msgstr "_Descartar a fotografia"
-#: ../libcheese/cheese-camera-device.c:327
+#: ../libcheese/cheese-camera-device.c:329
msgid "Device capabilities not supported"
msgstr "Funcionalidades do dispositivo não suportadas"
-#: ../libcheese/cheese-camera-device.c:488
+#: ../libcheese/cheese-camera-device.c:357
+#, c-format
+msgid "Failed to initialize device %s for capability probing"
+msgstr ""
+
+#: ../libcheese/cheese-camera-device.c:515
msgid "Unknown device"
msgstr "Dispositivo desconhecido"
-#: ../libcheese/cheese-camera-device.c:512
+#: ../libcheese/cheese-camera-device.c:539
msgid "Cancellable initialization not supported"
msgstr "A inicialização cancelável não é suportada"
-#: ../libcheese/cheese-camera.c:1134
+#: ../libcheese/cheese-camera.c:1156
#, c-format
msgid "No device found"
msgstr "Nenhum dispositivo encontrado"
-#: ../libcheese/cheese-camera.c:1153
+#: ../libcheese/cheese-camera.c:1175
msgid "One or more needed GStreamer elements are missing: "
msgstr ""
"Não se encontra instalado um ou mais elementos necessários do GStreamer: "
@@ -303,288 +409,224 @@ msgstr ""
#. * To enable to show the numbers in your own language, use %Id instead.
#. * Please leave the additional whitespace after the number
#.
-#: ../libcheese/cheese-countdown.c:436 ../libcheese/cheese-countdown.c:455
-#: ../libcheese/cheese-countdown.c:474
+#: ../libcheese/cheese-countdown.c:441 ../libcheese/cheese-countdown.c:460
+#: ../libcheese/cheese-countdown.c:479
#, c-format
msgid "%d "
msgstr "%d "
-#: ../src/cheese-commands-file.c:31
-msgid "_Skip"
-msgstr "_Ignorar"
-
-#: ../src/cheese-commands-file.c:32
-msgid "S_kip All"
-msgstr "Ignorar _Todos"
+#: ../src/cheese-effects-manager.vala:116
+msgid "No Effect"
+msgstr "Sem Efeitos"
-#: ../src/cheese-commands-file.c:33
-msgid "Delete _All"
-msgstr "_Apagar Todos"
+#: ../src/cheese-main.vala:37
+msgid "Enable wide mode"
+msgstr "Activar o modo extendido"
-#: ../src/cheese-commands-file.c:57
-#, c-format
-msgid ""
-"Failed to launch program to show:\n"
-"%s\n"
-"%s"
+#: ../src/cheese-main.vala:38
+msgid "Device to use as a camera"
msgstr ""
-"Falha ao iniciar a aplicação para apresentar:\n"
-"%s\n"
-"%s"
-#: ../src/cheese-commands-file.c:78
-msgid "Save File"
-msgstr "Gravar o Ficheiro"
+#: ../src/cheese-main.vala:38
+msgid "DEVICE"
+msgstr ""
-#: ../src/cheese-commands-file.c:116
-#, c-format
-msgid "Could not save %s"
-msgstr "Incapaz de gravar %s"
+#: ../src/cheese-main.vala:39
+#, fuzzy
+msgid "Output version information and exit"
+msgstr "devolver informação de versão e terminar"
-#: ../src/cheese-commands-file.c:139
-msgid "Error while deleting"
-msgstr "Erro ao apagar"
+#: ../src/cheese-main.vala:66
+msgid "- Take photos and videos from your webcam"
+msgstr "- Tirar fotografias e gravar vÃdeos com a sua webcam"
-#: ../src/cheese-commands-file.c:140
+#: ../src/cheese-main.vala:77
#, c-format
-msgid "The file \"%s\" cannot be deleted. Details: %s"
-msgstr "Incapaz de apagar o ficheiro \"%s\". Detalhes: %s"
+msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
-#: ../src/cheese-commands-file.c:167
-#, c-format
-msgid "Are you sure you want to permanently delete the %'d selected item?"
-msgid_plural ""
-"Are you sure you want to permanently delete the %'d selected items?"
-msgstr[0] ""
-"Tem a certeza de que deseja apagar definitivamente o %'d item seleccionado?"
-msgstr[1] ""
-"Tem a certeza de que deseja apagar definitivamente os %'d itens "
-"seleccionados?"
-
-#: ../src/cheese-commands-file.c:174
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\"?"
-msgstr "Tem a certeza de que deseja apagar definitivamente \"%s\"?"
+#: ../src/cheese-window.vala:689
+#, fuzzy
+msgid "Stop _Recording"
+msgstr "_Terminar a Gravação"
-#: ../src/cheese-commands-file.c:177
-#, c-format
-msgid "If you delete an item, it will be permanently lost."
-msgstr "Se apagar um item, este será definitivamente perdido."
+#: ../src/cheese-window.vala:821
+msgid "No effects found"
+msgstr "Nenhum efeito encontrado"
-#: ../src/cheese-commands-file.c:198
-msgid "Unknown Error"
-msgstr "Erro Desconhecido"
+#~ msgid "Set to True to use flash when taking a photo"
+#~ msgstr ""
+#~ "Definir como Verdadeiro para utilizar o flash ao tirar uma fotografia"
-#: ../src/cheese-commands-file.c:228
-msgid "Cannot move file to trash, do you want to delete immediately?"
-msgstr ""
-"Incapaz de mover o ficheiro para o lixo, deseja apagá-lo imediatamente?"
+#~ msgid "Use a flash"
+#~ msgstr "Utilizar o flash"
-#: ../src/cheese-commands-file.c:229
-#, c-format
-msgid "The file \"%s\" cannot be moved to the trash. Details: %s"
-msgstr "Incapaz de mover o ficheiro \"%s\" para o lixo. Detalhes: %s"
+#~ msgid "Switch to Burst Mode"
+#~ msgstr "Alternar para Modo de Rajada"
-#: ../src/cheese-commands-file.c:301
-#, c-format
-msgid "Really move all photos and videos to the trash?"
-msgstr "Mover mesmo todas as fotografias e vÃdeos para o lixo?"
+#~ msgid "Switch to Photo Mode"
+#~ msgstr "Alternar para Modo de Fotografia"
-#: ../src/cheese-commands-file.c:309
-msgid "_Move to Trash"
-msgstr "_Mover para o Lixo"
+#~ msgid "Switch to Video Mode"
+#~ msgstr "Alternar para Modo de VÃdeo"
-#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:654
-msgid "Unable to open help file for Cheese"
-msgstr "Incapaz de abrir o ficheiro de ajuda do Cheese"
+#~ msgid "Switch to the Effects Selector"
+#~ msgstr "Alternar para o Selector de Efeitos"
-#: ../src/cheese-commands-help.c:96
-msgid "translator-credits"
-msgstr ""
-"Duarte Loreto <happyguy_pt hotmail com>, 2008, 2009\n"
-"Miguel Pires da Rosa <miguelpires gmail com>, 2007"
-
-#: ../src/cheese-commands-help.c:99
-msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-msgstr ""
-"Esta aplicação é livre; pode redistribuÃ-la e/ou alterá-la sob as condições "
-"da Licença Pública Genérica GNU tal como publicada pela Free Software "
-"Foundation; ou a versão 2 da Licença ou (à sua escolha) qualquer versão "
-"posterior.\n"
+#~ msgid "_Skip"
+#~ msgstr "_Ignorar"
-#: ../src/cheese-commands-help.c:103
-msgid ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-msgstr ""
-"Esta aplicação é distribuÃda na expectativa de que seja útil, mas SEM "
-"QUALQUER GARANTIA; sem mesmo a garantia implÃcita de COMERCIABILIDADE ou "
-"ADEQUA��O A UM DETERMINADO PROP�SITO. Consulte a Licença Pública Genérica "
-"GNU para mais detalhes.\n"
-
-#: ../src/cheese-commands-help.c:107
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr ""
-"Deverá ter recebido uma cópia da Licença Pública Genérica GNU juntamente com "
-"esta aplicação; caso contrário, consulte <http://www.gnu.org/licenses/>."
+#~ msgid "S_kip All"
+#~ msgstr "Ignorar _Todos"
-#: ../src/cheese-commands-help.c:124
-msgid "Cheese Website"
-msgstr "Página do Cheese"
+#~ msgid "Delete _All"
+#~ msgstr "_Apagar Todos"
-#: ../src/cheese-effect-chooser.c:60
-msgid "No Effect"
-msgstr "Sem Efeitos"
+#~ msgid ""
+#~ "Failed to launch program to show:\n"
+#~ "%s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Falha ao iniciar a aplicação para apresentar:\n"
+#~ "%s\n"
+#~ "%s"
-#: ../src/cheese-effect-chooser.c:62
-msgid "Mauve"
-msgstr "Lilás"
+#~ msgid "Save File"
+#~ msgstr "Gravar o Ficheiro"
-#: ../src/cheese-effect-chooser.c:64
-msgid "Noir/Blanc"
-msgstr "Branco/Negro"
+#~ msgid "Could not save %s"
+#~ msgstr "Incapaz de gravar %s"
-#: ../src/cheese-effect-chooser.c:68
-msgid "Hulk"
-msgstr "Hulk"
+#~ msgid "Error while deleting"
+#~ msgstr "Erro ao apagar"
-#: ../src/cheese-effect-chooser.c:70
-msgid "Vertical Flip"
-msgstr "Espelho Vertical"
+#~ msgid "The file \"%s\" cannot be deleted. Details: %s"
+#~ msgstr "Incapaz de apagar o ficheiro \"%s\". Detalhes: %s"
-#: ../src/cheese-effect-chooser.c:72
-msgid "Horizontal Flip"
-msgstr "Espelho Horizontal"
+#~ msgid "Are you sure you want to permanently delete the %'d selected item?"
+#~ msgid_plural ""
+#~ "Are you sure you want to permanently delete the %'d selected items?"
+#~ msgstr[0] ""
+#~ "Tem a certeza de que deseja apagar definitivamente o %'d item "
+#~ "seleccionado?"
+#~ msgstr[1] ""
+#~ "Tem a certeza de que deseja apagar definitivamente os %'d itens "
+#~ "seleccionados?"
-#: ../src/cheese-effect-chooser.c:74
-msgid "Shagadelic"
-msgstr "Psicadélico"
+#~ msgid "Are you sure you want to permanently delete \"%s\"?"
+#~ msgstr "Tem a certeza de que deseja apagar definitivamente \"%s\"?"
-#: ../src/cheese-effect-chooser.c:76
-msgid "Vertigo"
-msgstr "Furacão"
+#~ msgid "If you delete an item, it will be permanently lost."
+#~ msgstr "Se apagar um item, este será definitivamente perdido."
-#: ../src/cheese-effect-chooser.c:78
-msgid "Edge"
-msgstr "Contornos"
+#~ msgid "Unknown Error"
+#~ msgstr "Erro Desconhecido"
-#: ../src/cheese-effect-chooser.c:80
-msgid "Dice"
-msgstr "Pedaços"
+#~ msgid "Cannot move file to trash, do you want to delete immediately?"
+#~ msgstr ""
+#~ "Incapaz de mover o ficheiro para o lixo, deseja apagá-lo imediatamente?"
-#: ../src/cheese-effect-chooser.c:82
-msgid "Warp"
-msgstr "Distorção"
+#~ msgid "The file \"%s\" cannot be moved to the trash. Details: %s"
+#~ msgstr "Incapaz de mover o ficheiro \"%s\" para o lixo. Detalhes: %s"
-#: ../src/cheese-no-camera.c:94
-msgid "No camera found!"
-msgstr "Nenhuma câmara encontrada!"
+#~ msgid "Really move all photos and videos to the trash?"
+#~ msgstr "Mover mesmo todas as fotografias e vÃdeos para o lixo?"
-#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1219
-msgid "Please refer to the help for further information."
-msgstr "Consulte a ajuda para mais informações."
+#~ msgid "_Move to Trash"
+#~ msgstr "_Mover para o Lixo"
-#: ../src/cheese-ui.h:32
-msgid "_Cheese"
-msgstr "_Cheese"
+#~ msgid "Unable to open help file for Cheese"
+#~ msgstr "Incapaz de abrir o ficheiro de ajuda do Cheese"
-#: ../src/cheese-ui.h:34
-msgid "_Edit"
-msgstr "_Editar"
+#~ msgid ""
+#~ "This program is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ msgstr ""
+#~ "Esta aplicação é livre; pode redistribuÃ-la e/ou alterá-la sob as "
+#~ "condições da Licença Pública Genérica GNU tal como publicada pela Free "
+#~ "Software Foundation; ou a versão 2 da Licença ou (à sua escolha) qualquer "
+#~ "versão posterior.\n"
-#: ../src/cheese-ui.h:35
-msgid "_Help"
-msgstr "_Ajuda"
+#~ msgid ""
+#~ "This program is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General "
+#~ "Public License for more details.\n"
+#~ msgstr ""
+#~ "Esta aplicação é distribuÃda na expectativa de que seja útil, mas SEM "
+#~ "QUALQUER GARANTIA; sem mesmo a garantia implÃcita de COMERCIABILIDADE ou "
+#~ "ADEQUA��O A UM DETERMINADO PROP�SITO. Consulte a Licença Pública "
+#~ "Genérica GNU para mais detalhes.\n"
-#: ../src/cheese-ui.h:38
-msgid "_Contents"
-msgstr "_Conteúdo"
+#~ msgid ""
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with this program. If not, see <http://www.gnu.org/licenses/>."
+#~ msgstr ""
+#~ "Deverá ter recebido uma cópia da Licença Pública Genérica GNU juntamente "
+#~ "com esta aplicação; caso contrário, consulte <http://www.gnu.org/licenses/";
+#~ ">."
-#: ../src/cheese-ui.h:38
-msgid "Help on this Application"
-msgstr "Ajuda sobre esta Aplicação"
+#~ msgid "Mauve"
+#~ msgstr "Lilás"
-#: ../src/cheese-ui.h:48
-msgid "_Photo"
-msgstr "_Foto"
+#~ msgid "Noir/Blanc"
+#~ msgstr "Branco/Negro"
-#: ../src/cheese-ui.h:49
-msgid "_Video"
-msgstr "_VÃdeo"
+#~ msgid "Hulk"
+#~ msgstr "Hulk"
-#: ../src/cheese-ui.h:50
-msgid "_Burst"
-msgstr "_Rajada"
+#~ msgid "Vertical Flip"
+#~ msgstr "Espelho Vertical"
-#: ../src/cheese-ui.h:54
-msgid "Countdown"
-msgstr "Contagem Decrescente"
+#~ msgid "Horizontal Flip"
+#~ msgstr "Espelho Horizontal"
-#: ../src/cheese-ui.h:64
-msgid "_Wide mode"
-msgstr "Modo _extendido"
+#~ msgid "Shagadelic"
+#~ msgstr "Psicadélico"
-#: ../src/cheese-ui.h:71
-msgid "_Recording"
-msgstr "_Gravação"
+#~ msgid "Vertigo"
+#~ msgstr "Furacão"
-#: ../src/cheese-ui.h:74 ../src/cheese-window.c:62
-msgid "_Take multiple Photos"
-msgstr "_Tirar múltiplas Fotografias"
+#~ msgid "Edge"
+#~ msgstr "Contornos"
-#: ../src/cheese-ui.h:78
-msgid "_Open"
-msgstr "_Abrir"
+#~ msgid "Dice"
+#~ msgstr "Pedaços"
-#: ../src/cheese-ui.h:80
-msgid "Save _Asâ?¦"
-msgstr "Gravar _Comoâ?¦"
+#~ msgid "Warp"
+#~ msgstr "Distorção"
-#: ../src/cheese-ui.h:82
-msgid "Move to _Trash"
-msgstr "Mover para o _Lixo"
+#~ msgid "No camera found!"
+#~ msgstr "Nenhuma câmara encontrada!"
-#: ../src/cheese-ui.h:84
-msgid "Delete"
-msgstr "Apagar"
+#~ msgid "Please refer to the help for further information."
+#~ msgstr "Consulte a ajuda para mais informações."
-#: ../src/cheese-ui.h:89
-msgid "Move All to Trash"
-msgstr "Mover Tudo para o Lixo"
+#~ msgid "Help on this Application"
+#~ msgstr "Ajuda sobre esta Aplicação"
-#: ../src/cheese-window.c:60
-msgid "_Start Recording"
-msgstr "_Iniciar a Gravação"
+#~ msgid "Countdown"
+#~ msgstr "Contagem Decrescente"
-#: ../src/cheese-window.c:61
-msgid "_Stop Recording"
-msgstr "_Terminar a Gravação"
+#~ msgid "Flash"
+#~ msgstr "Flash"
-#: ../src/cheese.c:96
-msgid "Be verbose"
-msgstr "Apresentar detalhes"
+#~ msgid "_Recording"
+#~ msgstr "_Gravação"
-#: ../src/cheese.c:98
-msgid "Enable wide mode"
-msgstr "Activar o modo extendido"
+#~ msgid "_Start Recording"
+#~ msgstr "_Iniciar a Gravação"
-#: ../src/cheese.c:100
-msgid "output version information and exit"
-msgstr "devolver informação de versão e terminar"
+#~ msgid "Be verbose"
+#~ msgstr "Apresentar detalhes"
-#: ../src/cheese.c:115
-msgid "- Take photos and videos with your webcam, with fun graphical effects"
-msgstr ""
-"- Tire fotografias e grave vÃdeos com a sua webcam, com engraçados efeitos "
-"gráficos"
+#~ msgid ""
+#~ "- Take photos and videos with your webcam, with fun graphical effects"
+#~ msgstr ""
+#~ "- Tire fotografias e grave vÃdeos com a sua webcam, com engraçados "
+#~ "efeitos gráficos"
#~ msgid "Could not set the Account Photo"
#~ msgstr "Incapaz de definir a Fotografia da Conta"
@@ -636,22 +678,12 @@ msgstr ""
#~ "Falha ao abrir o cliente de email para enviar uma mensagem para:\n"
#~ "%s"
-#~ msgid "Quit"
-#~ msgstr "Sair"
-
-#~ msgid "About"
-#~ msgstr "Sobre"
-
#~ msgid "The Y resolution of the image captured from the camera"
#~ msgstr "A resolução Y da imagem capturada pela câmara"
#~ msgid "Cannot move file to trash"
#~ msgstr "Incapaz de mover o ficheiro para o lixo"
-#~ msgid "A cheesy program to take photos and videos from your webcam"
-#~ msgstr ""
-#~ "Uma aplicação para tirar fotografias e gravar vÃdeos com a sua webcam"
-
#~ msgid "_Back"
#~ msgstr "_Retroceder"
diff --git a/po/ru.po b/po/ru.po
index 650a151..8b58df5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,9 +9,9 @@ msgstr ""
"Project-Id-Version: cheese gnome-2-22\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
"product=cheese&component=general\n"
-"POT-Creation-Date: 2010-02-21 21:37+0000\n"
-"PO-Revision-Date: 2010-02-18 02:59+0300\n"
-"Last-Translator: Alexander Saprykin <xelfium gmail com>\n"
+"POT-Creation-Date: 2010-08-26 01:17+0000\n"
+"PO-Revision-Date: 2010-08-26 17:17+0300\n"
+"Last-Translator: Yuri Myasoedov <omerta13 yandex ru>\n"
"Language-Team: Russian <gnome-cyr gnome org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:113
+#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:118
msgid "Cheese"
msgstr "Cheese"
@@ -143,15 +143,21 @@ msgstr ""
"Ñ?оÑ?огÑ?аÑ?иÑ?овании."
#: ../data/cheese.schemas.in.h:23
+msgid "Set to True to use flash when taking a photo"
+msgstr ""
+"Ð?Ñ?ли Ñ?Ñ?оÑ? клÑ?Ñ? Ñ?Ñ?Ñ?ановлен, пÑ?и Ñ?Ñ?Ñ?мке Ñ?оÑ?огÑ?аÑ?ий бÑ?деÑ? иÑ?полÑ?зоваÑ?Ñ?Ñ?Ñ? "
+"вÑ?пÑ?Ñ?ка."
+
+#: ../data/cheese.schemas.in.h:24
msgid "The device which points to the camera (e.g. /dev/video0)"
msgstr ""
"СÑ?Ñ?ока Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ва, коÑ?оÑ?аÑ? Ñ?казÑ?ваеÑ? на веб-камеÑ?Ñ?, напÑ?имеÑ? /dev/video0."
-#: ../data/cheese.schemas.in.h:24
+#: ../data/cheese.schemas.in.h:25
msgid "The height resolution of the image captured from the camera"
msgstr "РазÑ?еÑ?ение по веÑ?Ñ?икали изобÑ?ажениÑ?, коÑ?оÑ?ое бÑ?деÑ? полÑ?Ñ?аÑ?Ñ?Ñ?Ñ? Ñ? камеÑ?Ñ?"
-#: ../data/cheese.schemas.in.h:25
+#: ../data/cheese.schemas.in.h:26
msgid ""
"The length of time, in milliseconds, to delay between taking each photo in a "
"burst sequence of photos."
@@ -159,32 +165,36 @@ msgstr ""
"Ð?Ñ?одолжиÑ?елÑ?ноÑ?Ñ?Ñ? задеÑ?жки междÑ? Ñ?оÑ?огÑ?аÑ?иÑ?ми в Ñ?ежиме Ñ?еÑ?ии, в "
"миллиÑ?екÑ?ндаÑ?."
-#: ../data/cheese.schemas.in.h:26
+#: ../data/cheese.schemas.in.h:27
msgid "The number of photos to take in a single burst."
msgstr "СколÑ?ко Ñ?оÑ?огÑ?аÑ?ий Ñ?нÑ?Ñ?Ñ? в Ñ?ежиме Ñ?еÑ?ии."
-#: ../data/cheese.schemas.in.h:27
+#: ../data/cheese.schemas.in.h:28
msgid "The width resolution of the image captured from the camera"
msgstr ""
"РазÑ?еÑ?ение по гоÑ?изонÑ?али изобÑ?ажениÑ?, коÑ?оÑ?ое бÑ?деÑ? полÑ?Ñ?аÑ?Ñ?Ñ?Ñ? Ñ? камеÑ?Ñ?"
-#: ../data/cheese.schemas.in.h:28
+#: ../data/cheese.schemas.in.h:29
msgid "Use a countdown"
msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? обÑ?аÑ?нÑ?й оÑ?Ñ?Ñ?Ñ?Ñ?"
-#: ../data/cheese.schemas.in.h:29
+#: ../data/cheese.schemas.in.h:30
+msgid "Use a flash"
+msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? вÑ?пÑ?Ñ?кÑ?"
+
+#: ../data/cheese.schemas.in.h:31
msgid "Video Path"
msgstr "РаÑ?положение видеозапиÑ?ей"
-#: ../data/cheese.schemas.in.h:30
+#: ../data/cheese.schemas.in.h:32
msgid "Whether to enable immediate deletion"
msgstr "Ð?клÑ?Ñ?иÑ?Ñ? немедленное Ñ?даление"
-#: ../data/cheese.schemas.in.h:31
+#: ../data/cheese.schemas.in.h:33
msgid "Whether to start in wide mode"
msgstr "Ð?апÑ?Ñ?каÑ?Ñ?Ñ?Ñ? в Ñ?иÑ?окоÑ?кÑ?анном Ñ?ежиме"
-#: ../data/cheese.schemas.in.h:32
+#: ../data/cheese.schemas.in.h:34
msgid "Width resolution"
msgstr "РазÑ?еÑ?ение по гоÑ?изонÑ?али"
@@ -204,7 +214,7 @@ msgstr "Ð?еÑ?еклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? в Ñ?ежим видеозапиÑ?и"
msgid "Switch to the Effects Selector"
msgstr "Ð?еÑ?еклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? в окно вÑ?боÑ?а Ñ?Ñ?Ñ?екÑ?ов"
-#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:57 ../src/cheese-window.c:869
+#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:61 ../src/cheese-window.c:884
msgid "_Effects"
msgstr "_ÐÑ?Ñ?екÑ?Ñ?"
@@ -212,7 +222,7 @@ msgstr "_ÐÑ?Ñ?екÑ?Ñ?"
msgid "_Leave Fullscreen"
msgstr "Ð?Ñ?йÑ?и из _полноÑ?кÑ?анного Ñ?ежима"
-#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:68 ../src/cheese-window.c:59
+#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:72 ../src/cheese-window.c:59
msgid "_Take a Photo"
msgstr "_СÑ?оÑ?огÑ?аÑ?иÑ?оваÑ?Ñ?"
@@ -264,7 +274,7 @@ msgstr "Ð?аÑ?Ñ?Ñ?енноÑ?Ñ?Ñ?"
msgid "Webcam"
msgstr "Ð?еб-камеÑ?а"
-#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:632
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:640
msgid "Shutter sound"
msgstr "Ð?вÑ?к заÑ?воÑ?а"
@@ -280,24 +290,24 @@ msgstr "_СÑ?оÑ?огÑ?аÑ?иÑ?оваÑ?Ñ?"
msgid "_Discard photo"
msgstr "_Ð?Ñ?мениÑ?Ñ? Ñ?оÑ?о"
-#: ../libcheese/cheese-camera-device.c:327
+#: ../libcheese/cheese-camera-device.c:328
msgid "Device capabilities not supported"
msgstr "Ð?озможноÑ?Ñ?и Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ва не поддеÑ?живаÑ?Ñ?Ñ?Ñ?"
-#: ../libcheese/cheese-camera-device.c:488
+#: ../libcheese/cheese-camera-device.c:510
msgid "Unknown device"
msgstr "Ð?еизвеÑ?Ñ?ное Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?во"
-#: ../libcheese/cheese-camera-device.c:512
+#: ../libcheese/cheese-camera-device.c:534
msgid "Cancellable initialization not supported"
msgstr "Ð?Ñ?мена иниÑ?иализаÑ?ии невозможна"
-#: ../libcheese/cheese-camera.c:1134
+#: ../libcheese/cheese-camera.c:1139
#, c-format
msgid "No device found"
msgstr "УÑ?Ñ?Ñ?ойÑ?Ñ?в не найдено"
-#: ../libcheese/cheese-camera.c:1153
+#: ../libcheese/cheese-camera.c:1158
msgid "One or more needed GStreamer elements are missing: "
msgstr "Ð?дин или более компоненÑ?ов GStreamer оÑ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?Ñ?Ñ?:"
@@ -307,8 +317,8 @@ msgstr "Ð?дин или более компоненÑ?ов GStreamer оÑ?Ñ?Ñ?Ñ?Ñ?
#. * To enable to show the numbers in your own language, use %Id instead.
#. * Please leave the additional whitespace after the number
#.
-#: ../libcheese/cheese-countdown.c:436 ../libcheese/cheese-countdown.c:455
-#: ../libcheese/cheese-countdown.c:474
+#: ../libcheese/cheese-countdown.c:441 ../libcheese/cheese-countdown.c:460
+#: ../libcheese/cheese-countdown.c:479
#, c-format
msgid "%d "
msgstr "%d "
@@ -395,7 +405,7 @@ msgstr "УвеÑ?енÑ?, Ñ?Ñ?о Ñ?оÑ?иÑ?е Ñ?далиÑ?Ñ? вÑ?е Ñ?оÑ?огÑ?а
msgid "_Move to Trash"
msgstr "_УдалиÑ?Ñ? в коÑ?зинÑ?"
-#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:654
+#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:662
msgid "Unable to open help file for Cheese"
msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? Ñ?айл Ñ?пÑ?авки Cheese"
@@ -492,7 +502,7 @@ msgstr "Ð?Ñ?кÑ?ивление"
msgid "No camera found!"
msgstr "Ð?амеÑ?а не найдена!"
-#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1219
+#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1258
msgid "Please refer to the help for further information."
msgstr "Ð?бÑ?аÑ?иÑ?еÑ?Ñ? к Ñ?пÑ?авке за более подÑ?обной инÑ?оÑ?маÑ?ией."
@@ -532,35 +542,39 @@ msgstr "_СеÑ?иÑ?"
msgid "Countdown"
msgstr "Ð?бÑ?аÑ?нÑ?й оÑ?Ñ?Ñ?Ñ?Ñ?"
-#: ../src/cheese-ui.h:64
+#: ../src/cheese-ui.h:57
+msgid "Flash"
+msgstr "Ð?Ñ?пÑ?Ñ?ка"
+
+#: ../src/cheese-ui.h:68
msgid "_Wide mode"
msgstr "_ШиÑ?окоÑ?Ñ?аннÑ?й Ñ?ежим"
-#: ../src/cheese-ui.h:71
+#: ../src/cheese-ui.h:75
msgid "_Recording"
msgstr "_СнÑ?Ñ?Ñ? видео"
-#: ../src/cheese-ui.h:74 ../src/cheese-window.c:62
+#: ../src/cheese-ui.h:78 ../src/cheese-window.c:62
msgid "_Take multiple Photos"
msgstr "_СделаÑ?Ñ? Ñ?еÑ?иÑ? Ñ?оÑ?огÑ?аÑ?ий"
-#: ../src/cheese-ui.h:78
+#: ../src/cheese-ui.h:82
msgid "_Open"
msgstr "_Ð?Ñ?кÑ?Ñ?Ñ?Ñ?"
-#: ../src/cheese-ui.h:80
+#: ../src/cheese-ui.h:84
msgid "Save _Asâ?¦"
msgstr "СоÑ?Ñ?аниÑ?Ñ? _как..."
-#: ../src/cheese-ui.h:82
+#: ../src/cheese-ui.h:86
msgid "Move to _Trash"
msgstr "_УдалиÑ?Ñ? в коÑ?зинÑ?"
-#: ../src/cheese-ui.h:84
+#: ../src/cheese-ui.h:88
msgid "Delete"
msgstr "УдалиÑ?Ñ?"
-#: ../src/cheese-ui.h:89
+#: ../src/cheese-ui.h:93
msgid "Move All to Trash"
msgstr "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? вÑ?Ñ? в коÑ?зинÑ?"
@@ -572,22 +586,22 @@ msgstr "_Ð?аÑ?аÑ?Ñ? запиÑ?Ñ?"
msgid "_Stop Recording"
msgstr "_Ð?Ñ?Ñ?ановиÑ?Ñ? запиÑ?Ñ?"
-#: ../src/cheese.c:96
+#: ../src/cheese.c:97
msgid "Be verbose"
msgstr "Ð?одÑ?обнÑ?й вÑ?вод"
-#: ../src/cheese.c:98
+#: ../src/cheese.c:99
msgid "Enable wide mode"
msgstr "Ð?клÑ?Ñ?иÑ?Ñ? Ñ?иÑ?окоÑ?кÑ?аннÑ?й Ñ?ежим"
-#: ../src/cheese.c:100
+#: ../src/cheese.c:101
msgid "output version information and exit"
msgstr "вÑ?веÑ?Ñ?и инÑ?оÑ?маÑ?иÑ? о веÑ?Ñ?ии и вÑ?йÑ?и"
-#: ../src/cheese.c:115
+#: ../src/cheese.c:120
msgid "- Take photos and videos with your webcam, with fun graphical effects"
msgstr ""
-"â?? Ñ?оздание Ñ?оÑ?огÑ?аÑ?ий и видео Ñ? помоÑ?Ñ?Ñ? веб-камеÑ?Ñ?, Ñ? пÑ?именением занÑ?Ñ?нÑ?Ñ? "
+"â?? Ñ?оздание Ñ?оÑ?огÑ?аÑ?ий и видео Ñ? помоÑ?Ñ?Ñ? веб-камеÑ?Ñ? Ñ? пÑ?именением занÑ?Ñ?нÑ?Ñ? "
"Ñ?Ñ?Ñ?екÑ?ов"
#~ msgid "Camera setup failed"
diff --git a/po/sk.po b/po/sk.po
new file mode 100644
index 0000000..61df2d7
--- /dev/null
+++ b/po/sk.po
@@ -0,0 +1,482 @@
+# Slovak translation for cheese.
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the cheese package.
+# Miroslav BiÅ?as <mirek host sk>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cheese\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=cheese&component=general\n"
+"POT-Creation-Date: 2010-11-03 08:54+0000\n"
+"PO-Revision-Date: 2010-11-06 20:50+0100\n"
+"Last-Translator: Miroslav BiÅ?as <mirek host sk>\n"
+"Language-Team: Slovak <gnome-sk-list gnome org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
+"X-Poedit-Language: Slovak\n"
+"X-Poedit-Country: SLOVAKIA\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+# MyslÃm, že "Cheese" by sme mali preložiÅ¥. Už len preto, že to slovo je
+# Å¥ažko vysloviteľné pre toho, kto angliÄ?tine vôbec nerozumie: Che-é-se
+# A taktiež preto, lebo k "cheese" existujú slovenské ekvivalenty.
+#
+# mirek: ekvivalenty mame aj pre evolution, empathy a podobnym softom
+# a nazov zostava nezmeneny. ale ak budu suhlasit viaceri, tak moze byt
+# z toho aj Syyyr
+# PÅ : Sýýýr znie dobre... EÅ¡te by som porozmýšľal nad [Ä?ÃÃÃz] (aj s tými zátvorkami). Je to ale na prekladateľovi.
+#: ../data/cheese-about.ui.h:1 ../data/cheese.desktop.in.in.h:1
+#: ../src/cheese-main.vala:102
+msgid "Cheese"
+msgstr "Cheese"
+
+#: ../data/cheese-about.ui.h:2
+msgid "Cheese Website"
+msgstr "Web stránka Cheese"
+
+#: ../data/cheese-about.ui.h:3 ../data/cheese.desktop.in.in.h:3
+msgid "Take photos and videos with your webcam, with fun graphical effects"
+msgstr ""
+"FoÅ¥te a natáÄ?ajte videá vaÅ¡ou webovou kamerou, so zábavnými grafickými "
+"efektami"
+
+#: ../data/cheese-about.ui.h:4
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see http://www.gnu.org/licenses/\n";
+msgstr ""
+"Tento program je slobodný softvér. Môžete ho Ä?alej Å¡ÃriÅ¥ a/alebo"
+"upravovať podľa ustanovenà Všeobecnej verejnej licencie GNU tak, ako"
+"bola vydaná organizáciou Free Software Foundation, a to buÄ? verzie 2"
+"tejto licencie, alebo (podľa vášho uváženia) ktorejkoľvek neskoršej"
+"verzie.\n"
+"\n"
+"Tento program je rozÅ¡irovaný v nádeji, že bude užitoÄ?ný, avÅ¡ak BEZ"
+"AKEJKOĽVEK Z�RUKY. Neposkytujú sa ani odvodené záruky OBCHODOVATEĽNOSTI"
+"alebo VHODNOSTI PRE URÄ?ITÃ? Ã?Ä?EL. Ä?alÅ¡ie podrobnosti hľadajte vo"
+"VÅ¡eobecnej verejnej licencii GNU."
+"\n"
+"Kópiu Všeobecnej verejnej licencie GNU ste mali dostať spolu s týmto"
+"programom. Ak sa tak nestalo, navÅ¡tÃvte stránku http://www.gnu.org/licenses/\n";
+
+#: ../data/cheese-about.ui.h:10
+msgid "translator-credits"
+msgstr "Miroslav BiÅ?as <mirek host sk>"
+
+#: ../data/cheese-actions.ui.h:1
+msgid "Burst"
+msgstr "Rýchlospúšť"
+
+#: ../data/cheese-actions.ui.h:2
+msgid "Fullscreen"
+msgstr "Na celú obrazovku"
+
+#: ../data/cheese-actions.ui.h:3
+msgid "Help _Contents"
+msgstr "Obsah _pomocnÃka"
+
+#: ../data/cheese-actions.ui.h:4
+msgid "Move All to Trash"
+msgstr "Presunúť všetko do koša"
+
+#: ../data/cheese-actions.ui.h:5
+msgid "Move to _Trash"
+msgstr "Presunúť do _koša"
+
+#: ../data/cheese-actions.ui.h:6
+msgid "Next Effects"
+msgstr "Ä?alÅ¡ie efekty"
+
+#: ../data/cheese-actions.ui.h:7
+msgid "Previous Effects"
+msgstr "Predchádzajúce efekty"
+
+#: ../data/cheese-actions.ui.h:8
+msgid "Save _As"
+msgstr "Uložiť _ako"
+
+#: ../data/cheese-actions.ui.h:9
+msgid "Take _Multiple Photos"
+msgstr "_Odfotiť viacero fotiek"
+
+#: ../data/cheese-actions.ui.h:10
+msgid "_About"
+msgstr "_O programe"
+
+#: ../data/cheese-actions.ui.h:11
+msgid "_Cheese"
+msgstr "_Cheese"
+
+#: ../data/cheese-actions.ui.h:12
+msgid "_Delete"
+msgstr "O_dstrániť"
+
+#: ../data/cheese-actions.ui.h:13
+msgid "_Edit"
+msgstr "_Upraviť"
+
+#: ../data/cheese-actions.ui.h:14 ../data/cheese-main-window.ui.h:1
+msgid "_Effects"
+msgstr "_Efekty"
+
+#: ../data/cheese-actions.ui.h:15
+msgid "_Help"
+msgstr "_PomocnÃk"
+
+#: ../data/cheese-actions.ui.h:16
+msgid "_Open"
+msgstr "_Otvoriť"
+
+#: ../data/cheese-actions.ui.h:17
+msgid "_Photo"
+msgstr "_Fotiť"
+
+# http://lists.linux.sk/pipermail/sk-i18n/2007-November/000082.html
+#: ../data/cheese-actions.ui.h:18
+msgid "_Preferences"
+msgstr "Nas_tavenia"
+
+#: ../data/cheese-actions.ui.h:19
+msgid "_Quit"
+msgstr "U_konÄ?iÅ¥"
+
+#: ../data/cheese-actions.ui.h:20
+msgid "_Record a Video"
+msgstr "_Spustiť nahrávanie"
+
+#: ../data/cheese-actions.ui.h:21 ../data/cheese-main-window.ui.h:3
+msgid "_Take a Photo"
+msgstr "_Odfotiť"
+
+#: ../data/cheese-actions.ui.h:22
+msgid "_Video"
+msgstr "_Nahrať video"
+
+#: ../data/cheese-actions.ui.h:23
+msgid "_Wide Mode"
+msgstr "Širokouhlý _režim"
+
+#: ../data/cheese-main-window.ui.h:2
+msgid "_Leave Fullscreen"
+msgstr "_Opustiť režim celej obrazovky"
+
+#: ../data/cheese-prefs.ui.h:1
+msgid "Brightness"
+msgstr "Jas"
+
+#: ../data/cheese-prefs.ui.h:2
+msgid "Burst mode"
+msgstr "Režim rýchlospúšte"
+
+#: ../data/cheese-prefs.ui.h:3
+msgid "Contrast"
+msgstr "Kontrast"
+
+#: ../data/cheese-prefs.ui.h:4
+msgid "Delay between photos (seconds)"
+msgstr "Pauza medzi fotkami (sekundy)"
+
+#: ../data/cheese-prefs.ui.h:5
+msgid "Device"
+msgstr "Zariadenie"
+
+# namiesto "OdtieÅ?" by sa teoreticky mohlo použiÅ¥ "zafarbenie" (pozri inde)
+# PÅ : pozrel som...
+#: ../data/cheese-prefs.ui.h:6
+msgid "Hue"
+msgstr "OdtieÅ?"
+
+#: ../data/cheese-prefs.ui.h:7
+msgid "Image properties"
+msgstr "Vlastnosti obrázka"
+
+#: ../data/cheese-prefs.ui.h:8
+msgid "Number of photos"
+msgstr "PoÄ?et fotiek"
+
+#: ../data/cheese-prefs.ui.h:9
+msgid "Preferences"
+msgstr "Nastavenia"
+
+#: ../data/cheese-prefs.ui.h:10
+msgid "Resolution"
+msgstr "RozlÃÅ¡enie"
+
+# nie je to názov efektu
+#: ../data/cheese-prefs.ui.h:11
+msgid "Saturation"
+msgstr "Sýtosť"
+
+#: ../data/cheese-prefs.ui.h:12
+msgid "Webcam"
+msgstr "Webová kamera"
+
+#: ../data/cheese.desktop.in.in.h:2
+msgid "Cheese Webcam Booth"
+msgstr "Cheese - fotobúdka"
+
+#. Translators: please note, that the effect names are
+#. standarized and should not be translated
+#: ../data/cheese.schemas.in.h:3
+msgid ""
+"A list of effects applied on startup. Possible values are: \"mauve\", "
+"\"noir_blanc\", \"saturation\", \"hulk\", \"vertical-flip\", \"horizontal-"
+"flip\", \"shagadelic\", \"vertigo\", \"edge\", \"dice\" and \"warp\""
+msgstr ""
+"Zoznam efektov použitých pri štarte. Možné hodnoty sú: \"mauve"
+"\" (svetlofialová), \"noir_blanc\" (odtiene šedej), \"saturation\" (sýte "
+"farby), \"hulk\", \"vertical-flip\" (zvislé preklopenie), \"horizontal-flip"
+"\" (vodorovné preklopenie), \"shagadelic\", \"vertigo\" (vÃr), \"edge"
+"\" (zvýraznenie hrán), \"dice\" (mozaika) a \"warp\" (deformácia)"
+
+#: ../data/cheese.schemas.in.h:4
+msgid "Adjusts brightness level of the picture coming from the camera"
+msgstr "Nastavuje úroveÅ? jasu obrazu prichádzajúceho z kamery"
+
+#: ../data/cheese.schemas.in.h:5
+msgid "Adjusts contrast level of the picture coming from the camera"
+msgstr "Nastavuje úroveÅ? kontrastu obrazu prichádzajúceho z kamery"
+
+#: ../data/cheese.schemas.in.h:6
+msgid "Adjusts hue level of the picture coming from the camera"
+msgstr "Nastavuje úroveÅ? zafarbenia obrazu prichádzajúceho z kamery"
+
+#: ../data/cheese.schemas.in.h:7
+msgid "Adjusts saturation level of the picture coming from the camera"
+msgstr "Nastavuje úroveÅ? sýtosti obrazu prichádzajúceho z kamery"
+
+#: ../data/cheese.schemas.in.h:8
+msgid "Camera device string indicator"
+msgstr "Reťazcový indikátor zariadenia kamery"
+
+# * https://bugzilla.gnome.org/show_bug.cgi?id=613408
+#: ../data/cheese.schemas.in.h:9
+msgid ""
+"Defines the path where the photos are stored, if empty \"XDG_PHOTO/Webcam\" "
+"will be used."
+msgstr ""
+"Definuje cestu, kde sú fotky uložené. Ak nie je zadaná, bude použitá cesta "
+"\"XDG_PHOTO/Webcam\"."
+
+# * https://bugzilla.gnome.org/show_bug.cgi?id=613408
+#: ../data/cheese.schemas.in.h:10
+msgid ""
+"Defines the path where the videos are stored, if empty \"XDG_VIDEO/Webcam\" "
+"will be used."
+msgstr ""
+"Definuje cestu, kde sú videá uložené. Ak nie je zadaná, bude použitá cesta "
+"\"XDG_VIDEO/Webcam\"."
+
+#: ../data/cheese.schemas.in.h:11
+msgid "Height resolution"
+msgstr "Vertikálne rozlÃÅ¡enie"
+
+#: ../data/cheese.schemas.in.h:12
+msgid ""
+"If set to true, Cheese will start up in a wide mode with the image "
+"collection placed on the right-hand side. Useful with small screens."
+msgstr ""
+"Ak je nastavené na true, Cheese sa spustà v širokouhlom režime so zbierkou "
+"obrázkov umiestnenou na pravej strane. UžitoÄ?né na malých obrazovkách."
+
+# chýba preklad "feature allowing you"
+# mirek: opravene. neprelozil som akurat "feature allowing you", nakolko mi pride tato cast uz zbytocna (Cheese bude mat vlastnost (funkciu?), ktora bude okamzite subory odstranovat ...???)
+#: ../data/cheese.schemas.in.h:13
+msgid ""
+"If set to true, then Cheese will have a feature allowing you to delete a "
+"file immediately and in-place, instead of moving it to the trash. This "
+"feature can be dangerous, so use caution."
+msgstr ""
+"Ak je nastavené na true, Cheese bude odstraÅ?ovaÅ¥ súbory okamžite bez ich "
+"premiestÅ?ovania do koÅ¡a. Táto funkcia môže byÅ¥ nebezpeÄ?ná, takže si dávajte "
+"pozor."
+
+#: ../data/cheese.schemas.in.h:14
+msgid "Milliseconds between photos in burst mode."
+msgstr "Milisekundy medzi fotkami v režime rýchlospúšte."
+
+#: ../data/cheese.schemas.in.h:15
+msgid "Number of photos in burst mode."
+msgstr "PoÄ?et fotiek v režime rýchlospúšte."
+
+#: ../data/cheese.schemas.in.h:16
+msgid "Photo Path"
+msgstr "Cesta k fotkám"
+
+#: ../data/cheese.schemas.in.h:17
+msgid "Picture brightness"
+msgstr "Jas obrázka"
+
+#: ../data/cheese.schemas.in.h:18
+msgid "Picture contrast"
+msgstr "Kontrast obrázka"
+
+#: ../data/cheese.schemas.in.h:19
+msgid "Picture hue"
+msgstr "OdtieÅ? obrázka"
+
+#: ../data/cheese.schemas.in.h:20
+msgid "Picture saturation"
+msgstr "Sýtosť obrázka"
+
+#: ../data/cheese.schemas.in.h:21
+msgid "Selected Effects"
+msgstr "Zvolené efekty"
+
+#: ../data/cheese.schemas.in.h:22
+msgid "Set to True to show countdown when taking a photo"
+msgstr "Nastavte na True, ak chcete pri fotenà zobrazovaÅ¥ Ä?asovaÄ?"
+
+#: ../data/cheese.schemas.in.h:23
+msgid "The device which points to the camera (e.g. /dev/video0)"
+msgstr "Zariadenie, ktoré ukazuje na kameru (napr. /dev/video0)"
+
+#: ../data/cheese.schemas.in.h:24
+msgid "The height resolution of the image captured from the camera"
+msgstr "Vertikálne rozlÃÅ¡enie obrázka zÃskaného z kamery"
+
+#: ../data/cheese.schemas.in.h:25
+msgid ""
+"The length of time, in milliseconds, to delay between taking each photo in a "
+"burst sequence of photos."
+msgstr "Doba v milisekundách medzi každým odfotenÃm pri použità rýchlospúšte."
+
+#: ../data/cheese.schemas.in.h:26
+#, fuzzy
+msgid "The number of photos to take in a single burst."
+msgstr "PoÄ?et fotiek odfotených naraz pomocou rýchlospúšte."
+
+#: ../data/cheese.schemas.in.h:27
+msgid "The width resolution of the image captured from the camera"
+msgstr "Horizontálne rozlÃÅ¡enie obrázka zÃskaného z kamery"
+
+#: ../data/cheese.schemas.in.h:28
+msgid "Use a countdown"
+msgstr "PoužiÅ¥ Ä?asovaÄ?"
+
+#: ../data/cheese.schemas.in.h:29
+msgid "Video Path"
+msgstr "Cesta k videám"
+
+#: ../data/cheese.schemas.in.h:30
+msgid "Whether to enable immediate deletion"
+msgstr "Ä?i povoliÅ¥ okamžité mazanie"
+
+#: ../data/cheese.schemas.in.h:31
+msgid "Whether to start in wide mode"
+msgstr "Ä?i spustiÅ¥ v Å¡irokouhlom režime"
+
+#: ../data/cheese.schemas.in.h:32
+msgid "Width resolution"
+msgstr "Horizontálne rozlÃÅ¡enie"
+
+# shutter je "závierka", resp. "uzávierka". Je to odborný termÃn.
+# mirek: na toto som sa pytal v liste - zaklopka bol odporucany termin. necham ho.
+# PŠ: v ktorom liste? Je to uzávierka, bez debaty.
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.vala:593
+msgid "Shutter sound"
+msgstr "Zvuk uzávierky"
+
+#: ../libcheese/cheese-avatar-chooser.c:238
+msgid "Take a photo"
+msgstr "Odfotiť"
+
+#: ../libcheese/cheese-avatar-chooser.c:257
+msgid "_Take a photo"
+msgstr "_Odfotiť"
+
+#: ../libcheese/cheese-avatar-chooser.c:272
+msgid "_Discard photo"
+msgstr "_Zahodiť fotku"
+
+#: ../libcheese/cheese-camera-device.c:329
+msgid "Device capabilities not supported"
+msgstr "Schopnosti zariadenia nie sú podporované"
+
+#: ../libcheese/cheese-camera-device.c:357
+#, c-format
+msgid "Failed to initialize device %s for capability probing"
+msgstr "Zlyhala inicializácia zariadenia %s na zistenie schopnostÃ"
+
+#: ../libcheese/cheese-camera-device.c:515
+msgid "Unknown device"
+msgstr "Neznáme zariadenie"
+
+#: ../libcheese/cheese-camera-device.c:539
+#, fuzzy
+msgid "Cancellable initialization not supported"
+msgstr "Zrušiteľná inicializácia nie je podporovaná"
+
+#: ../libcheese/cheese-camera.c:1156
+#, c-format
+msgid "No device found"
+msgstr "Žiadne zariadenie nebolo nájdené"
+
+#: ../libcheese/cheese-camera.c:1175
+msgid "One or more needed GStreamer elements are missing: "
+msgstr "Chýba jeden alebo viacero potrebných prvkov pre GStreamer: "
+
+#. TRANSLATORS:
+#. * This is the countdown number when taking the photo.
+#. * If you leave as is (that is, %d), it will show 3, 2, 1, 0.
+#. * To enable to show the numbers in your own language, use %Id instead.
+#. * Please leave the additional whitespace after the number
+#.
+#: ../libcheese/cheese-countdown.c:441 ../libcheese/cheese-countdown.c:460
+#: ../libcheese/cheese-countdown.c:479
+#, c-format
+msgid "%d "
+msgstr "%d "
+
+# Ä?o tak "Bez efektu"?
+#: ../src/cheese-effects-manager.vala:116
+msgid "No Effect"
+msgstr "Žiadny efekt"
+
+#: ../src/cheese-main.vala:37
+msgid "Enable wide mode"
+msgstr "Povoliť širokouhlý režim"
+
+#: ../src/cheese-main.vala:38
+msgid "Device to use as a camera"
+msgstr "Zariadenie, ktoré sa má použiť ako kamera"
+
+#: ../src/cheese-main.vala:38
+msgid "DEVICE"
+msgstr "ZARIADENIE"
+
+#: ../src/cheese-main.vala:39
+msgid "Output version information and exit"
+msgstr "ZobraziÅ¥ informácie o verzii a skonÄ?iÅ¥"
+
+#: ../src/cheese-main.vala:66
+msgid "- Take photos and videos from your webcam"
+msgstr "- FoÅ¥te a natáÄ?ajte videá vaÅ¡ou webovou kamerou"
+
+#: ../src/cheese-main.vala:77
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"Spustite '%s --help' pre zobrazenie kompletného zoznamu dostupných "
+"prepÃnaÄ?ov prÃkazového riadku.\n"
+
+#: ../src/cheese-window.vala:688
+msgid "Stop _Recording"
+msgstr "_UkonÄ?iÅ¥ nahrávanie"
+
+#: ../src/cheese-window.vala:820
+msgid "No effects found"
+msgstr "Žiadne efekty neboli nájdené"
diff --git a/po/sl.po b/po/sl.po
index 2bb3487..7e5885f 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: cheese master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=cheese&component=general\n";
-"POT-Creation-Date: 2010-08-03 07:43+0000\n"
-"PO-Revision-Date: 2010-08-03 12:21+0100\n"
+"POT-Creation-Date: 2010-08-11 11:20+0000\n"
+"PO-Revision-Date: 2010-08-11 13:29+0100\n"
"Last-Translator: Matej UrbanÄ?iÄ? <mateju svn gnome org>\n"
"Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
"MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgstr ""
#: ../data/cheese-about.ui.h:1
#: ../data/cheese.desktop.in.in.h:1
-#: ../src/cheese-main.vala:105
+#: ../src/cheese-main.vala:103
msgid "Cheese"
msgstr "Cheese"
@@ -329,44 +329,45 @@ msgid "Width resolution"
msgstr "LoÄ?ljivost Å¡irine"
#: ../libcheese/cheese-avatar-chooser.c:110
+#: ../src/cheese-window.vala:589
msgid "Shutter sound"
msgstr "Zvok zaklopke"
-#: ../libcheese/cheese-avatar-chooser.c:236
+#: ../libcheese/cheese-avatar-chooser.c:238
msgid "Take a photo"
msgstr "Zajemi fotografijo"
-#: ../libcheese/cheese-avatar-chooser.c:255
+#: ../libcheese/cheese-avatar-chooser.c:257
msgid "_Take a photo"
msgstr "_Zajemi fotografijo"
-#: ../libcheese/cheese-avatar-chooser.c:270
+#: ../libcheese/cheese-avatar-chooser.c:272
msgid "_Discard photo"
msgstr "_Zavrzi sliko"
-#: ../libcheese/cheese-camera-device.c:328
+#: ../libcheese/cheese-camera-device.c:329
msgid "Device capabilities not supported"
msgstr "Zmožnosti naprave niso podprte"
-#: ../libcheese/cheese-camera-device.c:352
+#: ../libcheese/cheese-camera-device.c:357
#, c-format
msgid "Failed to initialize device %s for capability probing"
msgstr "ZaÄ?enjanje naprave %s za preiskovanje zmožnosti je spodletelo"
-#: ../libcheese/cheese-camera-device.c:510
+#: ../libcheese/cheese-camera-device.c:515
msgid "Unknown device"
msgstr "Neznana naprava"
-#: ../libcheese/cheese-camera-device.c:534
+#: ../libcheese/cheese-camera-device.c:539
msgid "Cancellable initialization not supported"
msgstr "Dejanje preklica zaÄ?enjanja ni podprto"
-#: ../libcheese/cheese-camera.c:1128
+#: ../libcheese/cheese-camera.c:1154
#, c-format
msgid "No device found"
msgstr "Ni mogoÄ?e najti naprave"
-#: ../libcheese/cheese-camera.c:1147
+#: ../libcheese/cheese-camera.c:1173
msgid "One or more needed GStreamer elements are missing: "
msgstr "Enega ali veÄ? zahtevanih predmetov programa GStreamer ni mogoÄ?e najti: "
@@ -383,35 +384,46 @@ msgstr "Enega ali veÄ? zahtevanih predmetov programa GStreamer ni mogoÄ?e najti:
msgid "%d "
msgstr "%d "
-#: ../src/cheese-main.vala:38
-msgid "Be verbose"
-msgstr "Podroben izpis"
+#: ../src/cheese-effects-manager.vala:116
+msgid "No Effect"
+msgstr "Brez uÄ?inka"
-#: ../src/cheese-main.vala:39
+#: ../src/cheese-main.vala:37
msgid "Enable wide mode"
msgstr "OmogoÄ?i Å¡iroki naÄ?in"
-#: ../src/cheese-main.vala:40
+#: ../src/cheese-main.vala:38
+msgid "Device to use as a camera"
+msgstr "Naprava, uporabljena kot spletna kamera"
+
+#: ../src/cheese-main.vala:38
+msgid "DEVICE"
+msgstr "NAPRAVA"
+
+#: ../src/cheese-main.vala:39
msgid "Output version information and exit"
msgstr "IzpiÅ¡i podrobnosti razliÄ?ice in konÄ?aj"
-#: ../src/cheese-main.vala:75
+#: ../src/cheese-main.vala:67
msgid "- Take photos and videos from your webcam"
msgstr "- Zajemanje slik in posnetkov s spletno kamero"
-#: ../src/cheese-main.vala:86
+#: ../src/cheese-main.vala:78
#, c-format
msgid "Run '%s --help' to see a full list of available command line options.\n"
msgstr "Za popoln seznam možnosti ukazne vrstice zaženite '%s --help'.\n"
-#: ../src/cheese-window.vala:604
+#: ../src/cheese-window.vala:642
msgid "Stop _Recording"
msgstr "_Zaustavi snemanje"
-#: ../src/cheese-window.vala:723
+#: ../src/cheese-window.vala:761
msgid "No effects found"
msgstr "UÄ?inkov ni mogoÄ?e najti"
+#~ msgid "Be verbose"
+#~ msgstr "Podroben izpis"
+
#~ msgid "Switch to Burst Mode"
#~ msgstr "Preklopi na zaporedni naÄ?in zajemanja"
diff --git a/po/sr.po b/po/sr.po
index 0c7ea3c..1445e28 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,22 +5,24 @@
#
#
# Ð?оÑ?ан РакиÑ? <grakic devbase net>, 2009.
+# Ð?илоÑ? Ð?оповиÑ? <gpopac gmail com>, 2010.
+#
msgid ""
msgstr ""
"Project-Id-Version: cheese\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
"product=cheese&component=general\n"
-"POT-Creation-Date: 2010-03-08 22:18+0000\n"
-"PO-Revision-Date: 2010-03-08 13:54+0100\n"
-"Last-Translator: Ð?Ñ?анко Ð?окановиÑ? <branko kokanovic gmail com>\n"
-"Language-Team: Serbian (sr) <gnom prevod org>\n"
+"POT-Creation-Date: 2010-08-13 15:31+0000\n"
+"PO-Revision-Date: 2010-08-23 20:57+0200\n"
+"Last-Translator: Ð?илоÑ? Ð?оповиÑ? <gpopac gmail com>\n"
+"Language-Team: Serbian <gnom prevod org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:113
+#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:118
msgid "Cheese"
msgstr "Ð?Ñ?иÑ?иÑ?а"
@@ -140,44 +142,53 @@ msgid "Set to True to show countdown when taking a photo"
msgstr "Ð?ко Ñ?е Ñ?кÑ?Ñ?Ñ?ено бÑ?оÑ?аÑ? Ñ?е биÑ?и пÑ?иказан пÑ?и Ñ?нимаÑ?Ñ? Ñ?оÑ?ке"
#: ../data/cheese.schemas.in.h:23
+#| msgid "Set to True to show countdown when taking a photo"
+msgid "Set to True to use flash when taking a photo"
+msgstr "Ð?ко Ñ?е Ñ?кÑ?Ñ?Ñ?ено блиÑ? Ñ?е окинÑ?Ñ?и пÑ?и Ñ?нимаÑ?Ñ? Ñ?оÑ?ке"
+
+#: ../data/cheese.schemas.in.h:24
msgid "The device which points to the camera (e.g. /dev/video0)"
msgstr "УÑ?еÑ?аÑ? коÑ?и води до камеÑ?е (нпÑ?. â??/dev/video0â??)"
-#: ../data/cheese.schemas.in.h:24
+#: ../data/cheese.schemas.in.h:25
msgid "The height resolution of the image captured from the camera"
msgstr "РезолÑ?Ñ?иÑ?а Ñ?лике Ñ?а веб камеÑ?е по виÑ?ини"
-#: ../data/cheese.schemas.in.h:25
+#: ../data/cheese.schemas.in.h:26
msgid ""
"The length of time, in milliseconds, to delay between taking each photo in a "
"burst sequence of photos."
msgstr "Ð?Ñ?еменÑ?ки Ñ?азмак, Ñ? милиÑ?екÑ?ндама, за Ñ?нимаÑ?е Ñ?оÑ?ки Ñ? Ñ?аÑ?алном Ñ?ежимÑ?."
-#: ../data/cheese.schemas.in.h:26
+#: ../data/cheese.schemas.in.h:27
msgid "The number of photos to take in a single burst."
msgstr "Ð?Ñ?оÑ? Ñ?лика коÑ?е Ñ?е Ñ?нимаÑ?Ñ? Ñ? Ñ?едном Ñ?аÑ?алÑ?."
-#: ../data/cheese.schemas.in.h:27
+#: ../data/cheese.schemas.in.h:28
msgid "The width resolution of the image captured from the camera"
msgstr "РезолÑ?Ñ?иÑ?а Ñ?лике Ñ?а веб камеÑ?е по Ñ?иÑ?ини"
-#: ../data/cheese.schemas.in.h:28
+#: ../data/cheese.schemas.in.h:29
msgid "Use a countdown"
msgstr "Ð?оÑ?иÑ?Ñ?и бÑ?оÑ?аÑ?"
-#: ../data/cheese.schemas.in.h:29
+#: ../data/cheese.schemas.in.h:30
+msgid "Use a flash"
+msgstr "Ð?кини блиÑ?"
+
+#: ../data/cheese.schemas.in.h:31
msgid "Video Path"
msgstr "Ð?Ñ?Ñ?аÑ?а за Ñ?нимке"
-#: ../data/cheese.schemas.in.h:30
+#: ../data/cheese.schemas.in.h:32
msgid "Whether to enable immediate deletion"
msgstr "Ð?а ли Ñ?Ñ?еба омогÑ?Ñ?иÑ?и Ñ?Ñ?енÑ?Ñ?но бÑ?иÑ?аÑ?е"
-#: ../data/cheese.schemas.in.h:31
+#: ../data/cheese.schemas.in.h:33
msgid "Whether to start in wide mode"
msgstr "Ð?а ли да Ñ?е покÑ?ене Ñ? Ñ?иÑ?оком Ñ?ежимÑ?"
-#: ../data/cheese.schemas.in.h:32
+#: ../data/cheese.schemas.in.h:34
msgid "Width resolution"
msgstr "РезолÑ?Ñ?иÑ?а по Ñ?иÑ?ини"
@@ -197,7 +208,7 @@ msgstr "Ð?Ñ?ебаÑ?и Ñ? Ñ?ежим Ñ?нимаÑ?а"
msgid "Switch to the Effects Selector"
msgstr "Ð?Ñ?ебаÑ?и на одабиÑ? еÑ?екаÑ?а"
-#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:57 ../src/cheese-window.c:869
+#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:61 ../src/cheese-window.c:884
msgid "_Effects"
msgstr "_Ð?Ñ?екÑ?и"
@@ -205,7 +216,7 @@ msgstr "_Ð?Ñ?екÑ?и"
msgid "_Leave Fullscreen"
msgstr "_Ð?апÑ?Ñ?Ñ?и Ñ?ео екÑ?ан"
-#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:68 ../src/cheese-window.c:59
+#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:72 ../src/cheese-window.c:59
msgid "_Take a Photo"
msgstr "_Сними Ñ?оÑ?кÑ?"
@@ -257,7 +268,7 @@ msgstr "Ð?Ñ?езаÑ?иÑ?ено"
msgid "Webcam"
msgstr "Ð?еб камеÑ?иÑ?а"
-#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:632
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:640
msgid "Shutter sound"
msgstr "Ð?вÑ?к Ñ?кÑ?оÑ?аÑ?а"
@@ -273,24 +284,24 @@ msgstr "_Сними Ñ?оÑ?кÑ?"
msgid "_Discard photo"
msgstr "Ð?_дбаÑ?и Ñ?оÑ?кÑ?"
-#: ../libcheese/cheese-camera-device.c:327
+#: ../libcheese/cheese-camera-device.c:328
msgid "Device capabilities not supported"
msgstr "Ð?огÑ?Ñ?ноÑ?Ñ?и Ñ?Ñ?еÑ?аÑ?а ниÑ?Ñ? подÑ?жане"
-#: ../libcheese/cheese-camera-device.c:488
+#: ../libcheese/cheese-camera-device.c:510
msgid "Unknown device"
msgstr "Ð?епознаÑ?и Ñ?Ñ?еÑ?аÑ?"
-#: ../libcheese/cheese-camera-device.c:512
+#: ../libcheese/cheese-camera-device.c:534
msgid "Cancellable initialization not supported"
msgstr "Ð?ониÑ?Ñ?аваÑ?е иниÑ?иÑ?ализаÑ?иÑ?е ниÑ?е подÑ?жано"
-#: ../libcheese/cheese-camera.c:1134
+#: ../libcheese/cheese-camera.c:1137
#, c-format
msgid "No device found"
msgstr "Ð?иÑ?е пÑ?онаÑ?ен ниÑ?едан Ñ?Ñ?еÑ?аÑ?"
-#: ../libcheese/cheese-camera.c:1153
+#: ../libcheese/cheese-camera.c:1156
msgid "One or more needed GStreamer elements are missing: "
msgstr "Ð?едоÑ?Ñ?аÑ?е Ñ?едан или виÑ?е елеменаÑ?а Ð?Ñ?Ñ?Ñ?имеÑ?а:"
@@ -300,8 +311,8 @@ msgstr "Ð?едоÑ?Ñ?аÑ?е Ñ?едан или виÑ?е елеменаÑ?а Ð?Ñ?Ñ?
#. * To enable to show the numbers in your own language, use %Id instead.
#. * Please leave the additional whitespace after the number
#.
-#: ../libcheese/cheese-countdown.c:436 ../libcheese/cheese-countdown.c:455
-#: ../libcheese/cheese-countdown.c:474
+#: ../libcheese/cheese-countdown.c:441 ../libcheese/cheese-countdown.c:460
+#: ../libcheese/cheese-countdown.c:479
#, c-format
msgid "%d "
msgstr "%d "
@@ -389,7 +400,7 @@ msgstr "Ð?а ли Ñ?игÑ?Ñ?но желиÑ? да пÑ?емеÑ?Ñ?иÑ? Ñ?ве Ñ?о
msgid "_Move to Trash"
msgstr "_Ð?Ñ?емеÑ?Ñ?и Ñ? Ñ?меÑ?е"
-#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:654
+#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:662
msgid "Unable to open help file for Cheese"
msgstr "Ð?е могÑ? да оÑ?воÑ?им пÑ?иÑ?иÑ?инÑ? даÑ?оÑ?екÑ? помоÑ?и"
@@ -485,7 +496,7 @@ msgstr "Ð?иÑ?опеÑ?еноÑ?Ñ?"
msgid "No camera found!"
msgstr "Ð?иÑ?е пÑ?онаÑ?ена камеÑ?иÑ?а!"
-#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1219
+#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1258
msgid "Please refer to the help for further information."
msgstr "Ð?огледаÑ? помоÑ? за виÑ?е инÑ?оÑ?маÑ?иÑ?а."
@@ -525,35 +536,39 @@ msgstr "_РаÑ?ал"
msgid "Countdown"
msgstr "Ð?Ñ?оÑ?аÑ?"
-#: ../src/cheese-ui.h:64
+#: ../src/cheese-ui.h:57
+msgid "Flash"
+msgstr "Ð?лиÑ?"
+
+#: ../src/cheese-ui.h:68
msgid "_Wide mode"
msgstr "ШиÑ?оки _Ñ?ежим"
-#: ../src/cheese-ui.h:71
+#: ../src/cheese-ui.h:75
msgid "_Recording"
msgstr "_СнимаÑ?е"
-#: ../src/cheese-ui.h:74 ../src/cheese-window.c:62
+#: ../src/cheese-ui.h:78 ../src/cheese-window.c:62
msgid "_Take multiple Photos"
msgstr "_Сними виÑ?е Ñ?оÑ?ки"
-#: ../src/cheese-ui.h:78
+#: ../src/cheese-ui.h:82
msgid "_Open"
msgstr "_Ð?Ñ?воÑ?и"
-#: ../src/cheese-ui.h:80
+#: ../src/cheese-ui.h:84
msgid "Save _Asâ?¦"
msgstr "СаÑ?Ñ?ваÑ? _као..."
-#: ../src/cheese-ui.h:82
+#: ../src/cheese-ui.h:86
msgid "Move to _Trash"
msgstr "Ð?Ñ?емеÑ?Ñ?и Ñ? _Ñ?меÑ?е"
-#: ../src/cheese-ui.h:84
+#: ../src/cheese-ui.h:88
msgid "Delete"
msgstr "Ð?бÑ?иÑ?и"
-#: ../src/cheese-ui.h:89
+#: ../src/cheese-ui.h:93
msgid "Move All to Trash"
msgstr "Ð?Ñ?емеÑ?Ñ?и Ñ?ве Ñ? Ñ?меÑ?е"
@@ -565,19 +580,19 @@ msgstr "_Ð?апоÑ?ни Ñ?нимаÑ?е"
msgid "_Stop Recording"
msgstr "_Ð?аÑ?Ñ?Ñ?ави Ñ?нимаÑ?е"
-#: ../src/cheese.c:96
+#: ../src/cheese.c:97
msgid "Be verbose"
msgstr "РеÑ?иÑ?и Ñ?ежим"
-#: ../src/cheese.c:98
+#: ../src/cheese.c:99
msgid "Enable wide mode"
msgstr "Ð?могÑ?Ñ?и Ñ?иÑ?оки Ñ?ежим"
-#: ../src/cheese.c:100
+#: ../src/cheese.c:101
msgid "output version information and exit"
msgstr "иÑ?пиÑ?и подаÑ?ке о издаÑ?Ñ? и изаÑ?и"
-#: ../src/cheese.c:115
+#: ../src/cheese.c:120
msgid "- Take photos and videos with your webcam, with fun graphical effects"
msgstr "â?? напÑ?ави Ñ?оÑ?ке и Ñ?нимке веб камеÑ?иÑ?ом, Ñ?з забавне еÑ?екÑ?е "
diff --git a/po/sr latin po b/po/sr latin po
index 2f91405..5829264 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -5,22 +5,24 @@
#
#
# Goran RakiÄ? <grakic devbase net>, 2009.
+# MiloÅ¡ PopoviÄ? <gpopac gmail com>, 2010.
+#
msgid ""
msgstr ""
"Project-Id-Version: cheese\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
"product=cheese&component=general\n"
-"POT-Creation-Date: 2010-03-08 22:18+0000\n"
-"PO-Revision-Date: 2010-03-08 13:54+0100\n"
-"Last-Translator: Branko KokanoviÄ? <branko kokanovic gmail com>\n"
-"Language-Team: Serbian (sr) <gnom prevod org>\n"
+"POT-Creation-Date: 2010-08-13 15:31+0000\n"
+"PO-Revision-Date: 2010-08-23 20:57+0200\n"
+"Last-Translator: MiloÅ¡ PopoviÄ? <gpopac gmail com>\n"
+"Language-Team: Serbian <gnom prevod org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:113
+#: ../data/cheese.desktop.in.in.h:1 ../src/cheese.c:118
msgid "Cheese"
msgstr "PtiÄ?ica"
@@ -140,44 +142,53 @@ msgid "Set to True to show countdown when taking a photo"
msgstr "Ako je ukljuÄ?eno brojaÄ? Ä?e biti prikazan pri snimanju fotke"
#: ../data/cheese.schemas.in.h:23
+#| msgid "Set to True to show countdown when taking a photo"
+msgid "Set to True to use flash when taking a photo"
+msgstr "Ako je ukljuÄ?eno blic Ä?e okinuti pri snimanju fotke"
+
+#: ../data/cheese.schemas.in.h:24
msgid "The device which points to the camera (e.g. /dev/video0)"
msgstr "UreÄ?aj koji vodi do kamere (npr. â??/dev/video0â??)"
-#: ../data/cheese.schemas.in.h:24
+#: ../data/cheese.schemas.in.h:25
msgid "The height resolution of the image captured from the camera"
msgstr "Rezolucija slike sa veb kamere po visini"
-#: ../data/cheese.schemas.in.h:25
+#: ../data/cheese.schemas.in.h:26
msgid ""
"The length of time, in milliseconds, to delay between taking each photo in a "
"burst sequence of photos."
msgstr "Vremenski razmak, u milisekundama, za snimanje fotki u rafalnom režimu."
-#: ../data/cheese.schemas.in.h:26
+#: ../data/cheese.schemas.in.h:27
msgid "The number of photos to take in a single burst."
msgstr "Broj slika koje se snimaju u jednom rafalu."
-#: ../data/cheese.schemas.in.h:27
+#: ../data/cheese.schemas.in.h:28
msgid "The width resolution of the image captured from the camera"
msgstr "Rezolucija slike sa veb kamere po Å¡irini"
-#: ../data/cheese.schemas.in.h:28
+#: ../data/cheese.schemas.in.h:29
msgid "Use a countdown"
msgstr "Koristi brojaÄ?"
-#: ../data/cheese.schemas.in.h:29
+#: ../data/cheese.schemas.in.h:30
+msgid "Use a flash"
+msgstr "Okini blic"
+
+#: ../data/cheese.schemas.in.h:31
msgid "Video Path"
msgstr "Putanja za snimke"
-#: ../data/cheese.schemas.in.h:30
+#: ../data/cheese.schemas.in.h:32
msgid "Whether to enable immediate deletion"
msgstr "Da li treba omoguÄ?iti trenutno brisanje"
-#: ../data/cheese.schemas.in.h:31
+#: ../data/cheese.schemas.in.h:33
msgid "Whether to start in wide mode"
msgstr "Da li da se pokrene u širokom režimu"
-#: ../data/cheese.schemas.in.h:32
+#: ../data/cheese.schemas.in.h:34
msgid "Width resolution"
msgstr "Rezolucija po Å¡irini"
@@ -197,7 +208,7 @@ msgstr "Prebaci u režim snimanja"
msgid "Switch to the Effects Selector"
msgstr "Prebaci na odabir efekata"
-#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:57 ../src/cheese-window.c:869
+#: ../data/cheese.ui.h:5 ../src/cheese-ui.h:61 ../src/cheese-window.c:884
msgid "_Effects"
msgstr "_Efekti"
@@ -205,7 +216,7 @@ msgstr "_Efekti"
msgid "_Leave Fullscreen"
msgstr "_Napusti ceo ekran"
-#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:68 ../src/cheese-window.c:59
+#: ../data/cheese.ui.h:7 ../src/cheese-ui.h:72 ../src/cheese-window.c:59
msgid "_Take a Photo"
msgstr "_Snimi fotku"
@@ -257,7 +268,7 @@ msgstr "PrezasiÄ?eno"
msgid "Webcam"
msgstr "Veb kamerica"
-#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:632
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.c:640
msgid "Shutter sound"
msgstr "Zvuk Å¡kljocanja"
@@ -273,24 +284,24 @@ msgstr "_Snimi fotku"
msgid "_Discard photo"
msgstr "O_dbaci fotku"
-#: ../libcheese/cheese-camera-device.c:327
+#: ../libcheese/cheese-camera-device.c:328
msgid "Device capabilities not supported"
msgstr "MoguÄ?nosti ureÄ?aja nisu podržane"
-#: ../libcheese/cheese-camera-device.c:488
+#: ../libcheese/cheese-camera-device.c:510
msgid "Unknown device"
msgstr "Nepoznati ureÄ?aj"
-#: ../libcheese/cheese-camera-device.c:512
+#: ../libcheese/cheese-camera-device.c:534
msgid "Cancellable initialization not supported"
msgstr "Poništavanje inicijalizacije nije podržano"
-#: ../libcheese/cheese-camera.c:1134
+#: ../libcheese/cheese-camera.c:1137
#, c-format
msgid "No device found"
msgstr "Nije pronaÄ?en nijedan ureÄ?aj"
-#: ../libcheese/cheese-camera.c:1153
+#: ../libcheese/cheese-camera.c:1156
msgid "One or more needed GStreamer elements are missing: "
msgstr "Nedostaje jedan ili više elemenata Gstrimera:"
@@ -300,8 +311,8 @@ msgstr "Nedostaje jedan ili više elemenata Gstrimera:"
#. * To enable to show the numbers in your own language, use %Id instead.
#. * Please leave the additional whitespace after the number
#.
-#: ../libcheese/cheese-countdown.c:436 ../libcheese/cheese-countdown.c:455
-#: ../libcheese/cheese-countdown.c:474
+#: ../libcheese/cheese-countdown.c:441 ../libcheese/cheese-countdown.c:460
+#: ../libcheese/cheese-countdown.c:479
#, c-format
msgid "%d "
msgstr "%d "
@@ -389,7 +400,7 @@ msgstr "Da li sigurno želiÅ¡ da premestiÅ¡ sve fotke i snimke u smeÄ?e?"
msgid "_Move to Trash"
msgstr "_Premesti u smeÄ?e"
-#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:654
+#: ../src/cheese-commands-help.c:39 ../src/cheese-window.c:662
msgid "Unable to open help file for Cheese"
msgstr "Ne mogu da otvorim ptiÄ?icinu datoteku pomoÄ?i"
@@ -485,7 +496,7 @@ msgstr "Vitoperenost"
msgid "No camera found!"
msgstr "Nije pronaÄ?ena kamerica!"
-#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1219
+#: ../src/cheese-no-camera.c:95 ../src/cheese-window.c:1258
msgid "Please refer to the help for further information."
msgstr "Pogledaj pomoÄ? za viÅ¡e informacija."
@@ -525,35 +536,39 @@ msgstr "_Rafal"
msgid "Countdown"
msgstr "BrojaÄ?"
-#: ../src/cheese-ui.h:64
+#: ../src/cheese-ui.h:57
+msgid "Flash"
+msgstr "Blic"
+
+#: ../src/cheese-ui.h:68
msgid "_Wide mode"
msgstr "Široki _režim"
-#: ../src/cheese-ui.h:71
+#: ../src/cheese-ui.h:75
msgid "_Recording"
msgstr "_Snimanje"
-#: ../src/cheese-ui.h:74 ../src/cheese-window.c:62
+#: ../src/cheese-ui.h:78 ../src/cheese-window.c:62
msgid "_Take multiple Photos"
msgstr "_Snimi više fotki"
-#: ../src/cheese-ui.h:78
+#: ../src/cheese-ui.h:82
msgid "_Open"
msgstr "_Otvori"
-#: ../src/cheese-ui.h:80
+#: ../src/cheese-ui.h:84
msgid "Save _Asâ?¦"
msgstr "SaÄ?uvaj _kao..."
-#: ../src/cheese-ui.h:82
+#: ../src/cheese-ui.h:86
msgid "Move to _Trash"
msgstr "Premesti u _smeÄ?e"
-#: ../src/cheese-ui.h:84
+#: ../src/cheese-ui.h:88
msgid "Delete"
msgstr "Obriši"
-#: ../src/cheese-ui.h:89
+#: ../src/cheese-ui.h:93
msgid "Move All to Trash"
msgstr "Premesti sve u smeÄ?e"
@@ -565,19 +580,19 @@ msgstr "_ZapoÄ?ni snimanje"
msgid "_Stop Recording"
msgstr "_Zaustavi snimanje"
-#: ../src/cheese.c:96
+#: ../src/cheese.c:97
msgid "Be verbose"
msgstr "ReÄ?iti režim"
-#: ../src/cheese.c:98
+#: ../src/cheese.c:99
msgid "Enable wide mode"
msgstr "OmoguÄ?i Å¡iroki režim"
-#: ../src/cheese.c:100
+#: ../src/cheese.c:101
msgid "output version information and exit"
msgstr "ispiÅ¡i podatke o izdanju i izaÄ?i"
-#: ../src/cheese.c:115
+#: ../src/cheese.c:120
msgid "- Take photos and videos with your webcam, with fun graphical effects"
msgstr "â?? napravi fotke i snimke veb kamericom, uz zabavne efekte "
diff --git a/po/sv.po b/po/sv.po
index 5e09ed7..3ef91b5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: cheese\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-26 21:19+0200\n"
-"PO-Revision-Date: 2010-07-26 21:25+0100\n"
+"POT-Creation-Date: 2010-08-18 22:21+0200\n"
+"PO-Revision-Date: 2010-08-18 22:21+0100\n"
"Last-Translator: Daniel Nylander <po danielnylander se>\n"
"Language-Team: Swedish <tp-sv listor tp-sv se>\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
#: ../data/cheese-about.ui.h:1
#: ../data/cheese.desktop.in.in.h:1
-#: ../src/cheese-main.vala:105
+#: ../src/cheese-main.vala:102
msgid "Cheese"
msgstr "Cheese"
@@ -37,13 +37,13 @@ msgid ""
"\n"
"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
"\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.\n"
+"You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/\n";
msgstr ""
"Detta program är fri programvara. Du kan distribuera det och/eller modifiera det under villkoren i GNU General Public License, publicerad av Free Software Foundation, antingen version 2 eller (om du så vill) någon senare version.\n"
"\n"
"Detta program distribueras i hopp om att det ska vara användbart, men UTAN N�GON SOM HELST GARANTI, även utan underförstådd garanti om S�LJBARHET eller L�MPLIGHET F�R N�GOT SPECIELLT �NDAM�L. Se GNU General Public License för ytterligare information.\n"
"\n"
-"Du bör ha fått en kopia av GNU General Public License tillsammans med detta program. Om inte, se <http://www.gnu.org/licenses/>.\n"
+"Du bör ha fått en kopia av GNU General Public License tillsammans med detta program. Om inte, se http://www.gnu.org/licenses/\n";
#: ../data/cheese-about.ui.h:10
msgid "translator-credits"
@@ -54,9 +54,8 @@ msgstr ""
"<tp-sv listor tp-sv se>."
#: ../data/cheese-actions.ui.h:1
-#, fuzzy
msgid "Burst"
-msgstr "_Multipelt"
+msgstr "Bildsekvens"
#: ../data/cheese-actions.ui.h:2
msgid "Fullscreen"
@@ -158,7 +157,7 @@ msgstr "Ljusstyrka"
#: ../data/cheese-prefs.ui.h:2
msgid "Burst mode"
-msgstr "Multipelt läge"
+msgstr "Bildsekvensläge"
#: ../data/cheese-prefs.ui.h:3
msgid "Contrast"
@@ -193,7 +192,6 @@ msgid "Resolution"
msgstr "Upplösning"
#: ../data/cheese-prefs.ui.h:11
-#: ../data/effects/saturation.effect.in.h:1
msgid "Saturation"
msgstr "Mättnad"
@@ -253,11 +251,11 @@ msgstr "Om inställd till sant kommer Cheese att ha en funktion som låter dig t
#: ../data/cheese.schemas.in.h:14
msgid "Milliseconds between photos in burst mode."
-msgstr "Millisekunder mellan foton i multipelt läge."
+msgstr "Millisekunder mellan foton i bildsekvensläge."
#: ../data/cheese.schemas.in.h:15
msgid "Number of photos in burst mode."
-msgstr "Antal foton i multipelt läge."
+msgstr "Antal foton i bildsekvensläge."
#: ../data/cheese.schemas.in.h:16
msgid "Photo Path"
@@ -297,11 +295,11 @@ msgstr "Höjdupplösningen för bilden som fångas med kameran"
#: ../data/cheese.schemas.in.h:25
msgid "The length of time, in milliseconds, to delay between taking each photo in a burst sequence of photos."
-msgstr "Längden i tid, i millisekunder, att vänta mellan varje fototagning i en multipel fotosekvens."
+msgstr "Längden i tid, i millisekunder, att vänta mellan varje fototagning i en fotosekvens."
#: ../data/cheese.schemas.in.h:26
msgid "The number of photos to take in a single burst."
-msgstr "Antalet foton att ta i en enda multipel tagning."
+msgstr "Antalet foton att ta i en enda bildsekvenstagning."
#: ../data/cheese.schemas.in.h:27
msgid "The width resolution of the image captured from the camera"
@@ -327,101 +325,46 @@ msgstr "Huruvida uppstart i bredläge ska ske"
msgid "Width resolution"
msgstr "Upplösning för bredd"
-#: ../data/effects/agingtv.effect.in.h:1
-msgid "Historical"
-msgstr ""
-
-#: ../data/effects/dicetv.effect.in.h:1
-msgid "Dice"
-msgstr "Tärning"
-
-#: ../data/effects/edgetv.effect.in.h:1
-msgid "Edge"
-msgstr "Kantig"
-
-#: ../data/effects/hulk.effect.in.h:1
-msgid "Hulk"
-msgstr "Hulken"
-
-#: ../data/effects/identity.effect.in.h:1
-msgid "No Effect"
-msgstr "Ingen effekt"
-
-#: ../data/effects/mauve.effect.in.h:1
-msgid "Mauve"
-msgstr "Mauve"
-
-#: ../data/effects/noir.effect.in.h:1
-msgid "Noir/Blanc"
-msgstr "Svartvitt"
-
-#: ../data/effects/optv.effect.in.h:1
-msgid "Optical Illusion"
-msgstr "Optisk illusion"
-
-#: ../data/effects/quarktv.effect.in.h:1
-msgid "Quark"
-msgstr ""
-
-#: ../data/effects/radioactv.effect.in.h:1
-msgid "Radioactive"
-msgstr "Radioaktiv"
-
-#: ../data/effects/shagadelictv.effect.in.h:1
-msgid "Shagadelic"
-msgstr "Psykedelisk"
-
-#: ../data/effects/streaktv.effect.in.h:1
-msgid "Kung-Fu"
-msgstr "Kung-Fu"
-
-#: ../data/effects/vertigotv.effect.in.h:1
-msgid "Vertigo"
-msgstr "Vertigo"
-
-#: ../data/effects/warptv.effect.in.h:1
-msgid "Warp"
-msgstr "Vrid"
-
#: ../libcheese/cheese-avatar-chooser.c:110
+#: ../src/cheese-window.vala:589
msgid "Shutter sound"
msgstr "Slutarljud"
-#: ../libcheese/cheese-avatar-chooser.c:236
+#: ../libcheese/cheese-avatar-chooser.c:238
msgid "Take a photo"
msgstr "Ta ett foto"
-#: ../libcheese/cheese-avatar-chooser.c:255
+#: ../libcheese/cheese-avatar-chooser.c:257
msgid "_Take a photo"
msgstr "_Ta ett foto"
-#: ../libcheese/cheese-avatar-chooser.c:270
+#: ../libcheese/cheese-avatar-chooser.c:272
msgid "_Discard photo"
msgstr "_Förkasta foto"
-#: ../libcheese/cheese-camera-device.c:328
+#: ../libcheese/cheese-camera-device.c:329
msgid "Device capabilities not supported"
msgstr "Enhetsförmågorna stöds inte"
-#: ../libcheese/cheese-camera-device.c:352
+#: ../libcheese/cheese-camera-device.c:357
#, c-format
msgid "Failed to initialize device %s for capability probing"
-msgstr ""
+msgstr "Misslyckades med att initiera enheten %s för funktionsavsökning"
-#: ../libcheese/cheese-camera-device.c:510
+#: ../libcheese/cheese-camera-device.c:515
msgid "Unknown device"
msgstr "Okänd enhet"
-#: ../libcheese/cheese-camera-device.c:534
+#: ../libcheese/cheese-camera-device.c:539
msgid "Cancellable initialization not supported"
msgstr "Avbrytningsbar initiering stöds inte"
-#: ../libcheese/cheese-camera.c:1116
+#: ../libcheese/cheese-camera.c:1154
#, c-format
msgid "No device found"
msgstr "Ingen enhet hittades"
-#: ../libcheese/cheese-camera.c:1135
+#: ../libcheese/cheese-camera.c:1173
msgid "One or more needed GStreamer elements are missing: "
msgstr "Ett eller flera nödvändiga GStreamer-element saknas: "
@@ -438,31 +381,67 @@ msgstr "Ett eller flera nödvändiga GStreamer-element saknas: "
msgid "%d "
msgstr "%d "
-#: ../src/cheese-main.vala:38
-msgid "Be verbose"
-msgstr "Var informativ"
+#: ../src/cheese-effects-manager.vala:116
+msgid "No Effect"
+msgstr "Ingen effekt"
-#: ../src/cheese-main.vala:39
+#: ../src/cheese-main.vala:37
msgid "Enable wide mode"
msgstr "Aktivera bredläge"
-#: ../src/cheese-main.vala:40
+#: ../src/cheese-main.vala:38
+msgid "Device to use as a camera"
+msgstr "Enhet att använda som en kamera"
+
+#: ../src/cheese-main.vala:38
+msgid "DEVICE"
+msgstr "ENHET"
+
+#: ../src/cheese-main.vala:39
msgid "Output version information and exit"
msgstr "Skriv ut versionsinformation och avsluta"
-#: ../src/cheese-main.vala:75
+#: ../src/cheese-main.vala:66
msgid "- Take photos and videos from your webcam"
msgstr "- Ta foton och videor från din webbkamera"
-#: ../src/cheese-main.vala:86
+#: ../src/cheese-main.vala:77
#, c-format
msgid "Run '%s --help' to see a full list of available command line options.\n"
msgstr "Kör \"%s --help\" för en komplett lista över tillgängliga kommandoradsflaggor.\n"
-#: ../src/cheese-window.vala:601
+#: ../src/cheese-window.vala:646
msgid "Stop _Recording"
msgstr "S_toppa inspelning"
+#: ../src/cheese-window.vala:765
+msgid "No effects found"
+msgstr "Inga effekter hittades"
+
+#~ msgid "Be verbose"
+#~ msgstr "Var informativ"
+#~ msgid "Dice"
+#~ msgstr "Tärning"
+#~ msgid "Edge"
+#~ msgstr "Kantig"
+#~ msgid "Hulk"
+#~ msgstr "Hulken"
+#~ msgid "Mauve"
+#~ msgstr "Mauve"
+#~ msgid "Noir/Blanc"
+#~ msgstr "Svartvitt"
+#~ msgid "Optical Illusion"
+#~ msgstr "Optisk illusion"
+#~ msgid "Radioactive"
+#~ msgstr "Radioaktiv"
+#~ msgid "Shagadelic"
+#~ msgstr "Psykedelisk"
+#~ msgid "Kung-Fu"
+#~ msgstr "Kung-Fu"
+#~ msgid "Vertigo"
+#~ msgstr "Vertigo"
+#~ msgid "Warp"
+#~ msgstr "Vrid"
#~ msgid "Switch to Burst Mode"
#~ msgstr "Växla till multipelt läge"
#~ msgid "Switch to Photo Mode"
diff --git a/po/ta.po b/po/ta.po
index 67419c2..9981eef 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: cheese.master.ta\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-02 16:56+0530\n"
-"PO-Revision-Date: 2010-08-02 16:57+0530\n"
+"POT-Creation-Date: 2010-09-03 16:08+0530\n"
+"PO-Revision-Date: 2010-09-03 16:09+0530\n"
"Last-Translator: Dr.T.Vasudevan <agnihot3 gmail com>\n"
"Language-Team: Tamil <<Ubuntu-l10n-tam lists ubuntu com>>\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
"\n"
#: ../data/cheese-about.ui.h:1 ../data/cheese.desktop.in.in.h:1
-#: ../src/cheese-main.vala:105
+#: ../src/cheese-main.vala:102
msgid "Cheese"
msgstr "��ஸ�"
@@ -55,16 +55,16 @@ msgid ""
"You should have received a copy of the GNU General Public License along with "
"this program. If not, see http://www.gnu.org/licenses/\n";
msgstr ""
-"�ந�த நிரல� �லவ� ம�ன� ப�ர�ளா��ம�. ந����ள� �லவ� ம�ன� ப�ர�ள� �ம�ப�பினால� வ�ளியி�ப�ப���"
-"�ி�ன�ய� ப�த� �ன�மதி���ான விதி�ளின� ப�ி �ந�த 2ம� பதிப�ப�ய� �ல�லத� ���த�த "
+"�ந�த நிரல� �லவ� ம�ன� ப�ர�ளா��ம�. ந����ள� �லவ� ம�ன� ப�ர�ள� �ம�ப�பினால� "
+"வ�ளியி�ப�ப����ி�ன�ய� ப�த� �ன�மதி���ான விதி�ளின� ப�ி �ந�த 2ம� பதிப�ப�ய� �ல�லத� ���த�த "
"பதிப�ப��ள�ய� ந����ள� (விர�ப�பப�ப�ி) மாற�றலாம�. �ல�லத� ம�ண���ம� பறிமாறலாம�. \n"
"\n"
"�பய��ப�ப��ம� �ன�ற �திர�பார�ப�ப��ன� �ந�த நிரல� வ�ளியி�ப�ப���ிறத�. �னால� விற�� த��தி, "
"��றிப�பி��� ��யல����ான த��தி �ள�ப� �ந�த �த�திரவாதம�ம� �ளி���ப�ப�வில�ல�. ம�ற� ��ண��� "
"விவர���ள����� �ி�ன�ய� ப�த� �ன�மதி���ான விதி�ள� பார����வ�ம�\n"
"\n"
-"�ி�ன�ய� ப�த� �ன�மதி���ான விதி�ளின� பிரதி ����ள����� �ி��த�திர���� வ�ண���ம�. "
-"�ல�ல�யானால� ����� பார����வ�ம�: <http://www.gnu.org/licenses/>.\n"
+"�ி�ன�ய� ப�த� �ன�மதி���ான விதி�ளின� பிரதி ����ள����� �ி��த�திர���� வ�ண���ம�. �ல�ல�யானால� "
+"����� பார����வ�ம�: <http://www.gnu.org/licenses/>.\n"
#: ../data/cheese-about.ui.h:10
msgid "translator-credits"
@@ -366,45 +366,45 @@ msgstr "��ல ம�ற�ம�யில� த�வ��� வ�ண�
msgid "Width resolution"
msgstr "��ல�� ��றிவ�"
-#: ../libcheese/cheese-avatar-chooser.c:110
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.vala:594
msgid "Shutter sound"
msgstr "à®?à®?"
-#: ../libcheese/cheese-avatar-chooser.c:236
+#: ../libcheese/cheese-avatar-chooser.c:238
msgid "Take a photo"
msgstr "�ர� ப����� ������வ�ம� "
-#: ../libcheese/cheese-avatar-chooser.c:255
+#: ../libcheese/cheese-avatar-chooser.c:257
msgid "_Take a photo"
msgstr "�ர� ப����� ������வ�ம� (_T)"
-#: ../libcheese/cheese-avatar-chooser.c:270
+#: ../libcheese/cheese-avatar-chooser.c:272
msgid "_Discard photo"
msgstr "_D ப�����வ� �றி"
-#: ../libcheese/cheese-camera-device.c:328
+#: ../libcheese/cheese-camera-device.c:329
msgid "Device capabilities not supported"
msgstr "�ாதன திறன��ள����� �தரவில�ல�"
-#: ../libcheese/cheese-camera-device.c:352
+#: ../libcheese/cheese-camera-device.c:357
#, c-format
msgid "Failed to initialize device %s for capability probing"
msgstr "�யல�ம� ��தன����� �ாதனம� %s� த�வ��� ம��ியவில�ல�"
-#: ../libcheese/cheese-camera-device.c:510
+#: ../libcheese/cheese-camera-device.c:515
msgid "Unknown device"
msgstr "த�ரியாத �ாதனம�"
-#: ../libcheese/cheese-camera-device.c:534
+#: ../libcheese/cheese-camera-device.c:539
msgid "Cancellable initialization not supported"
msgstr "ரத�த���ய�ய�����ிய த�வ����தல����� �தரவில�ல�"
-#: ../libcheese/cheese-camera.c:1128
+#: ../libcheese/cheese-camera.c:1156
#, c-format
msgid "No device found"
msgstr "�ாதனம� �த�வ�ம� �ி�����வில�ல�"
-#: ../libcheese/cheese-camera.c:1147
+#: ../libcheese/cheese-camera.c:1175
msgid "One or more needed GStreamer elements are missing: "
msgstr "த�வ�ப�ப��ம� ��ஸ��ர�மர� �ம�����ளில� �ன�ற� �ல�லத� �தற��� ம�ற�ப���வ� �ாணவில�ல�: "
@@ -420,31 +420,46 @@ msgstr "த�வ�ப�ப��ம� ��ஸ��ர�மர� �ம
msgid "%d "
msgstr "%d "
-#: ../src/cheese-main.vala:38
-msgid "Be verbose"
-msgstr "ந�ள� விள���மா� �ர����வ�ம�"
+#: ../src/cheese-effects-manager.vala:116
+msgid "No Effect"
+msgstr "விள�வ� �த�வ�ம� �ல�ல�"
-#: ../src/cheese-main.vala:39
+#: ../src/cheese-main.vala:37
msgid "Enable wide mode"
msgstr "��ல ம�ற�ம�ய� ��யல�ப��த�த�"
-#: ../src/cheese-main.vala:40
+#: ../src/cheese-main.vala:38
+msgid "Device to use as a camera"
+msgstr "ப���ப�ப� �ர�வியா�� பயன�ப��த�த �ாதனம�"
+
+#: ../src/cheese-main.vala:38
+msgid "DEVICE"
+msgstr "DEVICE"
+
+#: ../src/cheese-main.vala:39
msgid "Output version information and exit"
msgstr "பதிப�ப� த�வல� தந�த� வ�ளிய�றவ�ம�"
-#: ../src/cheese-main.vala:75
+#: ../src/cheese-main.vala:66
msgid "- Take photos and videos from your webcam"
msgstr "- வ�ப���ம� ம�லம� ப����� மற�ற�ம� வ��ிய� ������ள�"
-#: ../src/cheese-main.vala:86
+#: ../src/cheese-main.vala:77
#, c-format
msgid "Run '%s --help' to see a full list of available command line options.\n"
msgstr "'%s --help' � �ய���ி �ர�����ம� ����ள� வ�ி விர�ப�ப���ளின� ம�ழ�ப�ப���ியல�ய�ம� �ா����.\n"
-#: ../src/cheese-window.vala:603
+#: ../src/cheese-window.vala:689
msgid "Stop _Recording"
msgstr "பதிவ� நிற�த�தவ�ம� (_R)"
+#: ../src/cheese-window.vala:821
+msgid "No effects found"
+msgstr "விள�வ��ள� �த�வ�ம� �ி�����வில�ல�"
+
+#~ msgid "Be verbose"
+#~ msgstr "ந�ள� விள���மா� �ர����வ�ம�"
+
#~ msgid "Historical"
#~ msgstr "வரலாற�ற� ம�ிம�ய�ள�ள"
@@ -457,9 +472,6 @@ msgstr "பதிவ� நிற�த�தவ�ம� (_R)"
#~ msgid "Hulk"
#~ msgstr "ஹல���"
-#~ msgid "No Effect"
-#~ msgstr "விள�வ� �த�வ�ம� �ல�ல�"
-
#~ msgid "Mauve"
#~ msgstr "மாவ�"
diff --git a/po/ug.po b/po/ug.po
new file mode 100644
index 0000000..faa5133
--- /dev/null
+++ b/po/ug.po
@@ -0,0 +1,610 @@
+# Uighur translation for cheese.
+# Copyright (C) 2010 cheese's COPYRIGHT HOLDER
+# This file is distributed under the same license as the cheese package.
+# Gheyret Kenji <gheyret yahoo com>, 2010.
+# Sahran <sahran ug gmail com>, 2010
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cheese gnome-2-32\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=cheese&component=general\n"
+"POT-Creation-Date: 2010-10-21 16:21+0000\n"
+"PO-Revision-Date: 2010-08-26 01:17+0000\n"
+"Last-Translator: Sahran <sahran ug gmail com>\n"
+"Language-Team: Uyghur Computer Science Association <UKIJ yahoogroups com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../data/cheese-about.ui.h:1 ../data/cheese.desktop.in.in.h:1
+#: ../src/cheese-main.vala:102
+msgid "Cheese"
+msgstr "Cheese "
+
+#: ../data/cheese-about.ui.h:2
+msgid "Cheese Website"
+msgstr "Cheese تÙ?رتÛ?راسÙ?"
+
+#: ../data/cheese-about.ui.h:3 ../data/cheese.desktop.in.in.h:3
+msgid "Take photos and videos with your webcam, with fun graphical effects"
+msgstr ""
+"Û?Û?بÙ?اÙ?Û?را ئارÙ?Ù?Ù?Ù?Ù? سÙ?Ù? Û?Û? سÛ?رÛ?تÙ?Û?رÙ?Ù? تارتÙ?Ø´ بÙ?Ù?Û?Ù? بÙ?رگÛ? ئÛ?Ù?Ù?Úغا Ù?Ù?زÙ?Ù?ارÙ?Ù?Ù? "
+"گراÙ?Ù?Ù?Ù?Ù?Ù?Ù? ئÛ?Ù?Û?Ù?Ù?Û?رÙ?Ù? Ù?Ù?Ø´Ù?دÛ?"
+
+#: ../data/cheese-about.ui.h:4
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see http://www.gnu.org/licenses/\n";
+msgstr ""
+"بÛ? پرÙ?گراÙ?Ù?ا ئÛ?رÙ?Ù?Ù? Ù?Û?Ù?شاÙ? دÛ?تاÙ?Ø? سÙ?ز ئÛ?رÙ?Ù?Ù? Ù?Û?Ù?شاÙ? دÛ?تاÙ? Û?Û?خپÙ?سÙ? تارÙ?اتÙ?اÙ? "
+"GNU ئادÛ?تتÙ?Ù?Ù? ئاÙ?Ù?Ù?Û?Ù? ئÙ?جازÛ?تÙ?اÙ?Û? بÙ?Ù?Ù?Ú?Û? ئÛ?Ù?Ù? Ù?اÙ?تا تارÙ?Ù?تÙ?Ù¾ Ù?اÙ?Ù? "
+"ئÛ?زگÛ?رتÛ?Ù?Û?Ù?سÙ?زØ? سÙ?ز Ø´Û? ئÙ?جازÛ?ت Ù?Û?Ù?Ù?Ø´Ù?Ù?Ù?Ù?Ù?Ú Ø¦Ù?Ù?Ù?Ù?Ù?Ú?Ù? Ù?Û?شرÙ? Ù?اÙ?Ù? Ù?Û?Ù?Ù?رÙ? "
+"Ù?Û?شرÙ?Ù?Ù? ئÙ?Ø´Ù?Û?تسÙ?ÚÙ?ز بÙ?Ù?Ù?دÛ?.\n"
+"\n"
+"بÛ? پرÙ?گراÙ?Ù?Ù?Ù?Ù? تارÙ?Ù?تÙ?شتÙ?Ù?Ù? Ù?Û?Ù?سÛ?ت سÙ?زگÛ? Ù?Û?Ù?اÙ?Ù?Ù?Ù? ئÛ?Ù?Ù?Ù¾ Ù?Û?Ù?Ù?Ø´Ø? ئÛ?Ù?Ù?ا سÙ?دا "
+"Ù?اÙ?Ù? باشÙ?ا ئاÙ?اھÙ?دÛ? Ù?Ù?Ù?Ù?Ù?Ù?Ù?Ø´Ù?ا Ù?Ù?سبÛ?تÛ?Ù? Ú¾Û?Ú?Ù?اÙ?داÙ? Ù?اپاÙ?Û?ت Ù?Ù?Ù?. GNU "
+"ئادÛ?تتÙ?Ù?Ù? ئاÙ?Ù?Ù?Û?Ù? ئÙ?جازÛ?ت Ù?Û?Ù?Ù?Ø´Ù?Ù?Ù?Ù?Ù? Ù?Û?رÛ?Ù¾ تÛ?Ø®Ù?Ù?Û? Ù?Û?Ù¾ تÛ?پسÙ?Ù?اتÙ?ا ئÛ?رÙ?Ø´Ù?Ú.\n"
+"\n"
+"Ù?Û?زÙ?Û?ر پرÙ?گراÙ?Ù?ا بÙ?Ù?Û?Ù? بÙ?رگÛ? ئادÛ?تتÙ?Ù?Ù? ئاÙ?Ù?Ù?Û?Ù? ئÙ?جازÛ?تÙ?اÙ?Û?(GNU General "
+"Public) ئÙ?جازÛ?تÙ?اÙ?Ù?سÙ?Ù?Ù? Ú?Ù?Ù?Û?Ù? بÙ?رگÛ? بÙ?Ù?Ù?دÛ?.ئÛ?Ù?داÙ? بÙ?Ù?Ù?Ù?سا http://www.gnu.org/";
+"licenses غا Ù?اراÚ.\n"
+"\n"
+
+#: ../data/cheese-about.ui.h:10
+msgid "translator-credits"
+msgstr ""
+"Gheyret Kenji <gheyret yahoo com>\n"
+"Sahran <sahran live com>"
+
+#: ../data/cheese-actions.ui.h:1
+msgid "Burst"
+msgstr "ئارÙ?Ù?Ù?Û?-ئارÙ?ا تارتÙ?Ø´"
+
+#: ../data/cheese-actions.ui.h:2
+msgid "Fullscreen"
+msgstr "Ù¾Û?تÛ?Ù? ئÛ?Ù?راÙ?"
+
+#: ../data/cheese-actions.ui.h:3
+msgid "Help _Contents"
+msgstr "Ù?اردÛ?Ù? Ù?Û?زÙ?Û?Ù?Ù?(_C)"
+
+#: ../data/cheese-actions.ui.h:4
+msgid "Move All to Trash"
+msgstr "Ú¾Û?Ù?Ù?Ù?Ù?Ù? ئÛ?Ø®Ù?Û?تخاÙ?Ù?غا Ù?Û?تÙ?Û?Ø´"
+
+#: ../data/cheese-actions.ui.h:5
+msgid "Move to _Trash"
+msgstr "ئÛ?Ø®Ù?Û?تخاÙ?Ù?غا Ù?Û?تÙ?Û?(_T)"
+
+#: ../data/cheese-actions.ui.h:6
+msgid "Next Effects"
+msgstr "Ù?Û?Ù?Ù?Ù?Ù?Ù? ئÛ?Ù?Û?Ù?Ù?Û?ر"
+
+#: ../data/cheese-actions.ui.h:7
+msgid "Previous Effects"
+msgstr "ئاÙ?دÙ?Ù?Ù?Ù? ئÛ?Ù?Û?Ù?Ù?Û?ر"
+
+#: ../data/cheese-actions.ui.h:8
+msgid "Save _As"
+msgstr "باشÙ?ا ئاتتا ساÙ?Ù?ا(_A)"
+
+#: ../data/cheese-actions.ui.h:9
+msgid "Take _Multiple Photos"
+msgstr "Ù?Û?Ù¾ رÛ?سÙ?Ù? تارت(_M)"
+
+#: ../data/cheese-actions.ui.h:10
+msgid "_About"
+msgstr "Ú¾Û?Ù?Ù?Ù?دÛ?(_A)"
+
+#: ../data/cheese-actions.ui.h:11
+msgid "_Cheese"
+msgstr "Cheese(_C)"
+
+#: ../data/cheese-actions.ui.h:12
+msgid "_Delete"
+msgstr "ئÛ?Ú?Û?ر(_D)"
+
+#: ../data/cheese-actions.ui.h:13
+msgid "_Edit"
+msgstr "تÛ?ھرÙ?ر(_E)"
+
+#: ../data/cheese-actions.ui.h:14 ../data/cheese-main-window.ui.h:1
+msgid "_Effects"
+msgstr "ئÛ?Ù?Û?Ù?Ù?Û?ر(_E)"
+
+#: ../data/cheese-actions.ui.h:15
+msgid "_Help"
+msgstr "Ù?اردÛ?Ù?(_H)"
+
+#: ../data/cheese-actions.ui.h:16
+msgid "_Open"
+msgstr "ئاÚ?(_O)"
+
+#: ../data/cheese-actions.ui.h:17
+msgid "_Photo"
+msgstr "رÛ?سÙ?Ù?(_P)"
+
+#: ../data/cheese-actions.ui.h:18
+msgid "_Preferences"
+msgstr "Ù?اÙ?Ù?Ù?Ù?Ù?Ù?(_P)"
+
+#: ../data/cheese-actions.ui.h:19
+msgid "_Quit"
+msgstr "Ú?Û?Ù?Ù?Ù?(_Q)"
+
+#: ../data/cheese-actions.ui.h:20
+msgid "_Record a Video"
+msgstr "سÙ?Ù? خاتÙ?رÙ?Ù?Û?(_R)"
+
+#: ../data/cheese-actions.ui.h:21 ../data/cheese-main-window.ui.h:3
+msgid "_Take a Photo"
+msgstr "رÛ?سÙ?Ù? تارت(_T)"
+
+#: ../data/cheese-actions.ui.h:22
+msgid "_Video"
+msgstr "سÙ?Ù?(_V)"
+
+#: ../data/cheese-actions.ui.h:23
+msgid "_Wide Mode"
+msgstr "Ù?Û?ÚرÙ? ھاÙ?Û?ت(_W)"
+
+#: ../data/cheese-main-window.ui.h:2
+msgid "_Leave Fullscreen"
+msgstr "Ù¾Û?تÛ?Ù? ئÛ?Ù?راÙ?دÙ?Ù? ئاÙ?رÙ?Ù?(_L)"
+
+#: ../data/cheese-prefs.ui.h:1
+msgid "Brightness"
+msgstr "Ù?Ù?رÛ?Ù?Ù?Û?Ù?"
+
+#: ../data/cheese-prefs.ui.h:2
+msgid "Burst mode"
+msgstr "ئارÙ?Ù?Ù?Û?-ئارÙ?ا تارتÙ?Ø´"
+
+#: ../data/cheese-prefs.ui.h:3
+msgid "Contrast"
+msgstr "ئاÙ?-Ù?ارÙ?Ù?Ù?Ù?Ù?"
+
+#: ../data/cheese-prefs.ui.h:4
+msgid "Delay between photos (seconds)"
+msgstr "رÛ?سÙ?Ù? ئارÙ?Ù?Ù?Ù?Ù?دÙ?Ù?Ù? Û?اÙ?Ù?ت(سÛ?Ù?Û?Ù?ت)"
+
+#: ../data/cheese-prefs.ui.h:5
+msgid "Device"
+msgstr "ئÛ?سÙ?Û?Ù?Û?"
+
+#: ../data/cheese-prefs.ui.h:6
+msgid "Hue"
+msgstr "رÛ?ÚÚ¯Ù?"
+
+#: ../data/cheese-prefs.ui.h:7
+msgid "Image properties"
+msgstr "رÛ?سÙ?Ù? خاسÙ?Ù?Ù?Ù?"
+
+#: ../data/cheese-prefs.ui.h:8
+msgid "Number of photos"
+msgstr "رÛ?سÙ?Ù? ساÙ?Ù?"
+
+#: ../data/cheese-prefs.ui.h:9
+msgid "Preferences"
+msgstr "Ù?اÙ?Ù?Ù?Ù?Ù?Ù?"
+
+#: ../data/cheese-prefs.ui.h:10
+msgid "Resolution"
+msgstr "ئÛ?Ù?Ù?Ù?Ù?Ù?Ù?"
+
+#: ../data/cheese-prefs.ui.h:11
+msgid "Saturation"
+msgstr "تÙ?Ù?Û?Ù?Û?Ø´"
+
+#: ../data/cheese-prefs.ui.h:12
+msgid "Webcam"
+msgstr "Û?Û?بÙ?اÙ?Û?را"
+
+#: ../data/cheese.desktop.in.in.h:2
+msgid "Cheese Webcam Booth"
+msgstr "Cheese Webcam Booth"
+
+#. Translators: please note, that the effect names are
+#. standarized and should not be translated
+#: ../data/cheese.schemas.in.h:3
+msgid ""
+"A list of effects applied on startup. Possible values are: \"mauve\", "
+"\"noir_blanc\", \"saturation\", \"hulk\", \"vertical-flip\", \"horizontal-"
+"flip\", \"shagadelic\", \"vertigo\", \"edge\", \"dice\" and \"warp\""
+msgstr ""
+"باشÙ?اÙ?غاÙ?دا ئÙ?Ø´Ù?Ù?تÙ?دÙ?غاÙ? ئÛ?Ù?Û?Ù?Ù?Û?رÙ?Ù?Ú ØªÙ?زÙ?Ù?Ù?Ù?Ù?Ù?: \"mauve\"Ø?\"noir_blanc\", "
+"\"saturation\", \"hulk\", \"vertical-flip\", \"horizontal-flip\", "
+"\"shagadelic\", \"vertigo\", \"edge\", \"dice\" and \"warp\""
+
+#: ../data/cheese.schemas.in.h:4
+msgid "Adjusts brightness level of the picture coming from the camera"
+msgstr "Ù?اÙ?Û?رادÙ?Ù? Ù?Û?Ù?Ú¯Û?Ù? رÛ?سÙ?Ù?Ù?Ù?Ú Ù?Ù?رÛ?Ù?Ù?Û?Ù?Ù?Ù?Ù? تÛ?ÚØ´Û?Ø´"
+
+#: ../data/cheese.schemas.in.h:5
+msgid "Adjusts contrast level of the picture coming from the camera"
+msgstr "Ù?اÙ?Û?رادÙ?Ù? Ù?Û?Ù?Ú¯Û?Ù? رÛ?سÙ?Ù?Ù?Ù?Ú Ø¦Ø§Ù?-Ù?ارÙ?Ù?Ù?Ù?Ù? تÛ?ÚØ´Û?Ø´"
+
+#: ../data/cheese.schemas.in.h:6
+msgid "Adjusts hue level of the picture coming from the camera"
+msgstr "Ù?اÙ?Û?رادÙ?Ù? Ù?Û?Ù?Ú¯Û?Ù? رÛ?سÙ?Ù?Ù?Ù?Ú Ø±Û?ÚÚ¯Ù?Ù?Ù? تÛ?ÚØ´Û?Ø´"
+
+#: ../data/cheese.schemas.in.h:7
+msgid "Adjusts saturation level of the picture coming from the camera"
+msgstr "Ù?اÙ?Û?رادÙ?Ù? Ù?Û?Ù?Ú¯Û?Ù? رÛ?سÙ?Ù?Ù?Ù?Ú ØªÙ?Ù?Û?Ù?Û?Ø´ دÛ?رÙ?جÙ?سÙ?Ù?Ù? تÛ?ÚØ´Û?Ø´"
+
+#: ../data/cheese.schemas.in.h:8
+msgid "Camera device string indicator"
+msgstr "Ù?اÙ?Û?راÙ?Ù?Ú Ø¦Û?سÙ?Û?Ù?Û? ئاتÙ?"
+
+#: ../data/cheese.schemas.in.h:9
+msgid ""
+"Defines the path where the photos are stored, if empty \"XDG_PHOTO/Webcam\" "
+"will be used."
+msgstr ""
+"رÛ?سÙ?Ù? ساÙ?Ù?Ù?Ù?Ù?دÙ?غاÙ? Ù?Ù?Ù?Ù?Ù? بÛ?Ù?Ú¯Ù?Ù?Û?Ù?دÛ?. ئÛ?Ú¯Û?ر Ù?Û?رÛ?Ù? بÙ?Ù?سا \"XDG_PHOTO/Webcam\" "
+"Ù?Ù? ئÙ?Ø´Ù?Ù?تÙ?Ù?Ù?دÛ?"
+
+#: ../data/cheese.schemas.in.h:10
+msgid ""
+"Defines the path where the videos are stored, if empty \"XDG_VIDEO/Webcam\" "
+"will be used."
+msgstr ""
+"سÙ?Ù? ساÙ?Ù?Ù?Ù?Ù?دÙ?غاÙ? Ù?Ù?Ù?Ù?Ù? بÛ?Ù?Ú¯Ù?Ù?Û?Ù?دÛ?. ئÛ?Ú¯Û?ر Ù?Û?رÛ?Ù? بÙ?Ù?سا \"XDG_PHOTO/Webcam\" Ù?Ù? "
+"ئÙ?Ø´Ù?Ù?تÙ?Ù?Ù?دÛ?"
+
+#: ../data/cheese.schemas.in.h:11
+msgid "Height resolution"
+msgstr "تÙ?Ù? ئÛ?Ù?Ù?Ù?Ù?Ù?Ù?Ù?"
+
+#: ../data/cheese.schemas.in.h:12
+msgid ""
+"If set to true, Cheese will start up in a wide mode with the image "
+"collection placed on the right-hand side. Useful with small screens."
+msgstr ""
+"ئÛ?Ú¯Û?ر true Ù?Ù?Ù?Ù?Ù?ساØ? Cheese Ù?Û?ÚÙ? ھاÙ?Û?تتÛ? Ù?Ù?زغÙ?Ù?Ù?دÛ?Ø? ئÙ?Ú ØªÛ?رÛ?پتÛ? سÛ?رÛ?تÙ?Û?ر "
+"تÙ?Ù¾Ù?Ù?Ù?Ù? بار Ù?Û?زÙ?Û?Ù? Ù?Û?رÛ?Ù?Ù?دÛ?. Ù?Ù?Ú?Ù?Ù? ئÛ?Ù?راÙ?Ù?اردا بÛ?Ù?Ù? ئÙ?Ø´Ù?Û?تسÛ? بÛ?Ù?Ù?Û? Ù?اخشÙ? "
+"بÙ?Ù?Ù?دÛ?."
+
+#: ../data/cheese.schemas.in.h:13
+msgid ""
+"If set to true, then Cheese will have a feature allowing you to delete a "
+"file immediately and in-place, instead of moving it to the trash. This "
+"feature can be dangerous, so use caution."
+msgstr ""
+"TRUE Ù?Ù?Ù?Ù?Ù?سا ئÛ?Ø®Ù?Û?ت ساÙ?دÛ?Ù?Ù?غا تاشÙ?Ù?Ù?اÙ?Ù?اØ? Ú¾Û?ججÛ?تÙ?Ù? ئÛ?Ú?Û?رÛ?Û?Û?تÙ?دÛ?. Ø´Û?Úا بÛ?Ù?Ù? "
+"ئÙ?Ø´Ù?Û?تÙ?Û?Ù?دÛ? دÙ?Ù?Ù?Û?ت Ù?Ù?Ù?Ù?Ú."
+
+#: ../data/cheese.schemas.in.h:14
+msgid "Milliseconds between photos in burst mode."
+msgstr "ئÛ?زÙ?Û?Ù? تارتÙ?Ø´ ھاÙ?Ù?تÙ?دÙ?Ù?Ù? رÛ?سÙ?Ù?Ù?Û?رÙ?Ù?Ú Ø¦Ø§Ø±Ù?سÙ?دÙ?Ù?Ù? Û?اÙ?Ù?ت(Ù?Ù?Ù?Ù?Ù?سÛ?Ù?Û?Ù?ت)"
+
+#: ../data/cheese.schemas.in.h:15
+msgid "Number of photos in burst mode."
+msgstr "ئÛ?زÙ?Û?Ù? تارتÙ?Ø´ ھاÙ?Ù?تÙ?دÙ?Ù?Ù? رÛ?سÙ?Ù?Ù?Ù?Ú Ø³Ø§Ù?Ù?"
+
+#: ../data/cheese.schemas.in.h:16
+msgid "Photo Path"
+msgstr "رÛ?سÙ?Ù? Ù?Ù?Ù?Ù?"
+
+#: ../data/cheese.schemas.in.h:17
+msgid "Picture brightness"
+msgstr "رÛ?سÙ?Ù?Ù?Ù?Ú Ù?Ù?رÛ?Ù?Ù?Û?Ù?Ù?"
+
+#: ../data/cheese.schemas.in.h:18
+msgid "Picture contrast"
+msgstr "رÛ?سÙ?Ù?Ù?Ù?Ú Ø¦Ø§Ù?-Ù?ارÙ?Ù?Ù?Ù?Ù?"
+
+#: ../data/cheese.schemas.in.h:19
+msgid "Picture hue"
+msgstr "رÛ?سÙ?Ù?Ù?Ù?Ú Ø±Û?ÚÚ¯Ù?"
+
+#: ../data/cheese.schemas.in.h:20
+msgid "Picture saturation"
+msgstr "رÛ?سÙ?Ù?Ù?Ù?Ú ØªÙ?Ù?Û?Ù?Û?Ø´ دÛ?رÙ?جÙ?سÙ?"
+
+#: ../data/cheese.schemas.in.h:21
+msgid "Selected Effects"
+msgstr "ئÛ?Ù?Û?Ù? تاÙ?Ù?اش"
+
+#: ../data/cheese.schemas.in.h:22
+msgid "Set to True to show countdown when taking a photo"
+msgstr "ئÛ?Ú¯Û?ر True Ù?Ù?Ù?Ù?Ù?ساØ? رÛ?سÙ?Ù? تارتÙ?Û?اتÙ?اÙ?دا Ú?اغدا تÛ?تÛ?ر ساÙ?اشÙ?Ù? Ù?Û?رسÙ?تÙ?دÛ?"
+
+#: ../data/cheese.schemas.in.h:23
+msgid "The device which points to the camera (e.g. /dev/video0)"
+msgstr "Ù?اÙ?Û?راÙ?Ù?Ú Ø¦Û?سÙ?Û?Ù?Û? Ù?Û?Ù?تÙ?سÙ? (Ù?Û?سÙ?Ù?Û?Ù?: /dev/video0)"
+
+#: ../data/cheese.schemas.in.h:24
+msgid "The height resolution of the image captured from the camera"
+msgstr "Ù?اÙ?Û?رادا تارتÙ?اÙ? رÛ?سÙ?Ù?Ù?Ù?Ú Ø¨Ù?Ù? Ù?Û?Ù?Ù?Ù?Ù?شتÙ?Ù?Ù? ئÛ?Ù?Ù?Ù?Ù?Ù?Ù?Ù?"
+
+#: ../data/cheese.schemas.in.h:25
+msgid ""
+"The length of time, in milliseconds, to delay between taking each photo in a "
+"burst sequence of photos."
+msgstr "ئارÙ?Ù?Ù?Û?-ئارÙ?ا تارتÙ?Ø´ ھاÙ?Ù?تÙ?دÙ?Ù?Ù? تÙ?Ù?Ù?Ø´ Û?اÙ?تÙ?(Ù?Ù?Ù?Ù?Ù?سÛ?Ù?Û?Ù?ت)."
+
+#: ../data/cheese.schemas.in.h:26
+msgid "The number of photos to take in a single burst."
+msgstr "بÙ?ر Ù?Û?تÙ?Ù?Ù?Ù?Ù? ئارÙ?Ù?Ù?Û?-ئارÙ?ا تارتÙ?شتاØ? تارتÙ?دÙ?غاÙ? رÛ?سÙ?Ù? ساÙ?Ù?."
+
+#: ../data/cheese.schemas.in.h:27
+msgid "The width resolution of the image captured from the camera"
+msgstr "Ù?اÙ?Û?رادÙ?Ù? تÛ?تÛ?Ù?غاÙ? رÛ?سÙ?Ù?Ù?Ù?Ú Ù?Û?ÚÙ?Ù?Ù? ئÛ?Ù?Ù?Ù?Ù?Ù?Ù?Ù?"
+
+#: ../data/cheese.schemas.in.h:28
+msgid "Use a countdown"
+msgstr "تÛ?تÛ?ر ساÙ?اشÙ?Ù? ئÙ?Ø´Ù?Û?ت"
+
+#: ../data/cheese.schemas.in.h:29
+msgid "Video Path"
+msgstr "سÙ?Ù? Ù?Ù?Ù?Ù?"
+
+#: ../data/cheese.schemas.in.h:30
+msgid "Whether to enable immediate deletion"
+msgstr "دÛ?رھاÙ? ئÛ?Ú?Û?رÛ?Ø´Ù?Ù? Ù?Ù?زغÙ?تاÙ?دÛ? Ù?Ù?Ù?"
+
+#: ../data/cheese.schemas.in.h:31
+msgid "Whether to start in wide mode"
+msgstr "Ù?Û?Ú Ú¾Ø§Ù?Û?تتÛ? Ù?Ù?زغاÙ?سÛ?Ù?Ù?Û?"
+
+#: ../data/cheese.schemas.in.h:32
+msgid "Width resolution"
+msgstr "Ù?اÙ? Ù?Û?Ù?Ù?Ù?Ù?شتÙ?Ù?Ù? ئÛ?Ù?Ù?Ù?Ù?Ù?Ù?Ù?"
+
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.vala:594
+msgid "Shutter sound"
+msgstr "Shutter Ù?Ù?Ú Ø¦Ø§Û?ازÙ?"
+
+#: ../libcheese/cheese-avatar-chooser.c:238
+msgid "Take a photo"
+msgstr "رÛ?سÙ?Ù? تارتÙ?دÛ?"
+
+#: ../libcheese/cheese-avatar-chooser.c:257
+msgid "_Take a photo"
+msgstr "رÛ?سÙ?Ù? تارت(_T)"
+
+#: ../libcheese/cheese-avatar-chooser.c:272
+msgid "_Discard photo"
+msgstr "رÛ?سÙ?Ù?Ù?Ù? تاشÙ?Ù?Û?Û?ت(_D)"
+
+#: ../libcheese/cheese-camera-device.c:329
+msgid "Device capabilities not supported"
+msgstr "ئÛ?سÙ?Û?Ù?Ù?Ù?Ù?Ú Ø¨Û? ئÙ?Ù?تÙ?دارÙ?Ù?Ù? ئÙ?Ø´Ù?Û?تÙ?Ù?Ù?Ù? بÙ?Ù?Ù?اÙ?دÛ?"
+
+#: ../libcheese/cheese-camera-device.c:357
+#, c-format
+msgid "Failed to initialize device %s for capability probing"
+msgstr "ئÛ?سÙ?Ù?Ù?Û? %s Ù?Ù?Ú Ø¦Ù?Ù?تÙ?دارÙ?Ù?Ù? تÛ?Ù?Ø´Û?رÛ?Ø´Ù?Ù? دÛ?سÙ?Û?Ù¾Ù?Û?شتÛ?رÛ?Ø´ Ù?Û?غÙ?Û?Ù¾ بÙ?Ù?دÙ?"
+
+#: ../libcheese/cheese-camera-device.c:515
+msgid "Unknown device"
+msgstr "Ù?اÙ?Û?Ù?Û?Ù? ئÛ?سÙ?Û?Ù?Û?"
+
+#: ../libcheese/cheese-camera-device.c:539
+msgid "Cancellable initialization not supported"
+msgstr "Ù?Ù?رÙ?اتÙ?اشÙ?Ù? ئÙ?Ù?اÛ?Û?تسÙ?ز Ù?Ù?Ù?Ù?Ø´Ù?ا بÙ?Ù?Ù?اÙ?دÛ?"
+
+#: ../libcheese/cheese-camera.c:1156
+#, c-format
+msgid "No device found"
+msgstr "ئÛ?سÙ?Ù?Ù?Û? تÛ?Ù¾Ù?Ù?Ù?Ù?دÙ?"
+
+#: ../libcheese/cheese-camera.c:1175
+msgid "One or more needed GStreamer elements are missing: "
+msgstr "GStreamer Ù?Ù?Ú Ù?Û?رÛ?Ù?Ù?Ù?Ù? ئÛ?Ù?Û?Ù?Û?Ù?ت تÛ?Ù¾Ù?Ù?Ù?Ù?دÙ?: "
+
+#. TRANSLATORS:
+#. * This is the countdown number when taking the photo.
+#. * If you leave as is (that is, %d), it will show 3, 2, 1, 0.
+#. * To enable to show the numbers in your own language, use %Id instead.
+#. * Please leave the additional whitespace after the number
+#.
+#: ../libcheese/cheese-countdown.c:441 ../libcheese/cheese-countdown.c:460
+#: ../libcheese/cheese-countdown.c:479
+#, c-format
+msgid "%d "
+msgstr "%d "
+
+#: ../src/cheese-effects-manager.vala:116
+msgid "No Effect"
+msgstr "ئÛ?Ù?Û?Ù? Ù?Ù?Ù?"
+
+#: ../src/cheese-main.vala:37
+msgid "Enable wide mode"
+msgstr "Ù?Û?ÚرÙ? ھاÙ?Û?تÙ?Ù? ئÙ?Ø´Ù?Ù?تÙ?دÛ?"
+
+#: ../src/cheese-main.vala:38
+msgid "Device to use as a camera"
+msgstr "Ù?اÙ?Û?را سÛ?Ù¾Ù?تÙ?دÛ? ئÙ?Ø´Ù?Ù?تÙ?دÙ?غاÙ? ئÛ?سÙ?Ù?Ù?Û?"
+
+#: ../src/cheese-main.vala:38
+msgid "DEVICE"
+msgstr "ئÛ?سÙ?Û?Ù?Û?"
+
+#: ../src/cheese-main.vala:39
+msgid "Output version information and exit"
+msgstr "Ù?Û?شر ئÛ?Ú?Û?رÙ?Ù?Ù? Ù?Û?رسÙ?تÙ?Ù¾ ئاخÙ?رÙ?اشتÛ?رÙ?دÛ?"
+
+#: ../src/cheese-main.vala:66
+msgid "- Take photos and videos from your webcam"
+msgstr "- Û?Û?بÙ?اÙ?Û?را ئارÙ?Ù?Ù?Ù?Ù? سÙ?Ù? Û?Û? سÛ?رÛ?تÙ?Û?رÙ?Ù? تارتÙ?دÛ?"
+
+#: ../src/cheese-main.vala:77
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"'%s --help' ئÙ?جرا Ù?Ù?Ù?Ù?Ù?سا بÛ?Ù?رÛ?Ù? Ù?Û?رÙ? تاÙ?Ù?اÙ?Ù?Ù?سÙ?Ù?Ù? ئÙ?Ø´Ù?Ù?تÙ?Ø´Ù?Ù?Ú ØªÙ?Ù?Û?Ù? "
+"تÙ?زÙ?Ù?Ù?Ù?Ù?Ù? Ù?Û?رÛ?Ù?Ù?دÛ?.\n"
+
+#: ../src/cheese-window.vala:689
+msgid "Stop _Recording"
+msgstr "خاتÙ?رÙ?Ù?Û?Ø´Ù?Ù? تÙ?ختات(_R)"
+
+#: ../src/cheese-window.vala:821
+msgid "No effects found"
+msgstr "ئÛ?Ù?Û?Ù?Ù?Û?ر تÛ?Ù¾Ù?Ù?Ù?Ù?دÙ?"
+
+#~ msgid "Set to True to use flash when taking a photo"
+#~ msgstr "رÛ?سÙ?Ù? تارتÙ?اÙ?دا Ú?Ù?راغÙ?Ù? ئÙ?Ø´Ù?Û?تÙ?Û?Ù?Ú?Ù? بÙ?Ù?سا True Ù?Ù?Ù?سا بÙ?Ù?Ù?دÛ?"
+
+#~ msgid "Use a flash"
+#~ msgstr "Ú?Ù?راغ ئÙ?Ø´Ù?Û?ت"
+
+#~ msgid "Switch to Burst Mode"
+#~ msgstr "ئارÙ?Ù?Ù?Û?-ئارÙ?ا تارتÙ?Ø´Ù?ا ئاÙ?Ù?اش"
+
+#~ msgid "Switch to Photo Mode"
+#~ msgstr "ئادÛ?تتÙ?Ù?Ù? تارتÙ?Ø´Ù?ا ئاÙ?Ù?اش"
+
+#~ msgid "Switch to Video Mode"
+#~ msgstr "سÙ?Ù? تارتÙ?Ø´Ù?ا ئاÙ?Ù?اش"
+
+#~ msgid "Switch to the Effects Selector"
+#~ msgstr "ئÛ?Ù?Û?Ù? تاÙ?Ù?اش ھاÙ?Ù?تÙ?Ú¯Û? ئاÙ?Ù?اش"
+
+#~ msgid "_Skip"
+#~ msgstr "ئاتÙ?ا(_S)"
+
+#~ msgid "S_kip All"
+#~ msgstr "Ú¾Û?Ù?Ù?Ù?دÙ?Ù? ئاتÙ?ا(_K)"
+
+#~ msgid "Delete _All"
+#~ msgstr "Ú¾Û?Ù?Ù?Ù?Ù?Ù? ئÛ?Ú?Û?ر(_A)"
+
+#~ msgid ""
+#~ "Failed to launch program to show:\n"
+#~ "%s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ù?Û?رسÙ?تÙ?Ø´ پرÙ?گراÙ?Ù?Ù?سÙ?Ù?Ù? Ù?Ù?زغÙ?تÙ?Ø´ Ù?Û?غÙ?Û?Ù¾ بÙ?Ù?دÙ?:\n"
+#~ "%s\n"
+#~ "%s"
+
+#~ msgid "Save File"
+#~ msgstr "Ú¾Û?ججÛ?ت ساÙ?Ù?ا"
+
+#~ msgid "Could not save %s"
+#~ msgstr "%s Ù?Ù? ساÙ?Ù?Ù?غÙ?Ù?Ù? بÙ?Ù?Ù?Ù?دÙ?"
+
+#~ msgid "Error while deleting"
+#~ msgstr "ئÛ?Ú?Û?رÛ?شتÛ? خاتاÙ?Ù?Ù? Ù?Û?رÛ?Ù?دÙ?"
+
+#~ msgid "The file \"%s\" cannot be deleted. Details: %s"
+#~ msgstr "Ú¾Û?ججÛ?ت \"%s\" Ù?Ù? ئÛ?Ú?Û?رگÙ?Ù?Ù? بÙ?Ù?Ù?Ù?دÙ?. تÛ?پسÙ?Ù?اتÙ?: %s"
+
+#~ msgid "Are you sure you want to permanently delete the %'d selected item?"
+#~ msgid_plural ""
+#~ "Are you sure you want to permanently delete the %'d selected items?"
+#~ msgstr[0] "سÙ?ز تاÙ?Ù?اÙ?غاÙ? %'d تÛ?رÙ?Ù? راستÙ?Ù?Ù?Ù?ا Ù?Û?ÚÚ¯Û?Ù?Û?Ù? ئÛ?Ú?Û?رÛ?Ù?سÙ?زØ?"
+
+#~ msgid "Are you sure you want to permanently delete \"%s\"?"
+#~ msgstr "\"%s\" Ù?Ù? راستÙ?Ù?Ù?Ù?ا Ù?Û?ÚÚ¯Û?Ù?Û?Ù? ئÛ?Ú?Û?رÛ?Ù?سÙ?زØ?"
+
+#~ msgid "If you delete an item, it will be permanently lost."
+#~ msgstr "ئÛ?Ú¯Û?ر تÛ?ردÙ?Ù? بÙ?رÙ?Ù? ئÛ?Ú?Û?رسÙ?ÚÙ?ز ئÛ?Ù?داÙ?تا ئÛ? Ù?Û?ÚÚ¯Û?Ù?Û?Ù? Ù?Ù?Ù?Ù?Ù?Ù?دÛ?."
+
+#~ msgid "Unknown Error"
+#~ msgstr "Ù?اÙ?Û?Ù?Û?Ù? خاتاÙ?Ù?Ù?"
+
+#~ msgid "Cannot move file to trash, do you want to delete immediately?"
+#~ msgstr "Ú¾Û?ججÛ?تÙ?Ù? ئÛ?Ø®Ù?Û?تخاÙ?Ù?غا Ù?Û?تÙ?Ù?Ù?Û?Ù?Ù?Ù?دÙ?Ø? دÛ?رھاÙ? ئÛ?Ú?Û?رÛ?Ù?سÙ?زØ?"
+
+#~ msgid "The file \"%s\" cannot be moved to the trash. Details: %s"
+#~ msgstr "Ú¾Û?ججÛ?ت \"%s\" Ù?Ù? ئÛ?Ø®Ù?Û?ت ساÙ?دÛ?Ù?Ù?غا Ù?Û?تÙ?Ù?Ú¯Ù?Ù?Ù? بÙ?Ù?Ù?Ù?دÙ?. تÛ?پسÙ?Ù?اتÙ?: %s"
+
+#~ msgid "Really move all photos and videos to the trash?"
+#~ msgstr "راستÙ?ا بارÙ?Ù?Ù? رÛ?سÙ?Ù? Û?Û? سÙ?Ù?Ù?ارÙ?Ù? ئÛ?Ø®Ù?Û?ت ساÙ?دÛ?Ù?Ù?غا Ù?Û?تÙ?Û?Ù?دÛ?Ø?"
+
+#~ msgid "_Move to Trash"
+#~ msgstr "ئÛ?Ø®Ù?Û?ت ساÙ?دÛ?Ù?Ù?غا Ù?Û?تÙ?Û?(_M)"
+
+#~ msgid "Unable to open help file for Cheese"
+#~ msgstr "Cheese Ù?Ù?Ú Ù?اردÛ?Ù?Ú?Ù? Ú¾Û?ججÙ?تÙ?Ù?Ù? ئاÚ?Ù?Ù?Ù?Ù? بÙ?Ù?Ù?Ù?دÙ?"
+
+#~ msgid ""
+#~ "This program is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ msgstr ""
+#~ "بÛ? پرÙ?گراÙ?Ù?ا ئÛ?رÙ?Ù?Ù? Ù?Û?Ù?شاÙ? دÛ?تاÙ?Ø? سÙ?ز ئÛ?رÙ?Ù?Ù? Ù?Û?Ù?شاÙ? دÛ?تاÙ? Û?Û?خپÙ?سÙ? "
+#~ "تارÙ?اتÙ?اÙ? GNU ئادÛ?تتÙ?Ù?Ù? ئاÙ?Ù?Ù?Û?Ù? ئÙ?جازÛ?تÙ?اÙ?Û? بÙ?Ù?Ù?Ú?Û? ئÛ?Ù?Ù? Ù?اÙ?تا تارÙ?Ù?تÙ?Ù¾ "
+#~ "Ù?اÙ?Ù? ئÛ?زگÛ?رتÛ?Ù?Û?Ù?سÙ?زØ? سÙ?ز Ø´Û? ئÙ?جازÛ?ت Ù?Û?Ù?Ù?Ø´Ù?Ù?Ù?Ù?Ù?Ú Ø¦Ù?Ù?Ù?Ù?Ù?Ú?Ù? Ù?Û?شرÙ? Ù?اÙ?Ù? "
+#~ "Ù?Û?Ù?Ù?رÙ? Ù?Û?شرÙ?Ù?Ù? ئÙ?Ø´Ù?Û?تسÙ?ÚÙ?ز بÙ?Ù?Ù?دÛ?.\n"
+
+#~ msgid ""
+#~ "This program is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General "
+#~ "Public License for more details.\n"
+#~ msgstr ""
+#~ "بÛ? پرÙ?گراÙ?Ù?Ù?Ù?Ù? تارÙ?Ù?تÙ?شتÙ?Ù?Ù? Ù?Û?Ù?سÛ?ت سÙ?زگÛ? Ù?Û?Ù?اÙ?Ù?Ù?Ù? ئÛ?Ù?Ù?Ù¾ Ù?Û?Ù?Ù?Ø´Ø? ئÛ?Ù?Ù?ا سÙ?دا "
+#~ "Ù?اÙ?Ù? باشÙ?ا ئاÙ?اھÙ?دÛ? Ù?Ù?Ù?Ù?Ù?Ù?Ù?Ø´Ù?ا Ù?Ù?سبÛ?تÛ?Ù? Ú¾Û?Ú?Ù?اÙ?داÙ? Ù?اپاÙ?Û?ت Ù?Ù?Ù?. GNU "
+#~ "ئادÛ?تتÙ?Ù?Ù? ئاÙ?Ù?Ù?Û?Ù? ئÙ?جازÛ?ت Ù?Û?Ù?Ù?Ø´Ù?Ù?Ù?Ù?Ù? Ù?Û?رÛ?Ù¾ تÛ?Ø®Ù?Ù?Û? Ù?Û?Ù¾ تÛ?پسÙ?Ù?اتÙ?ا "
+#~ "ئÛ?رÙ?Ø´Ù?Ú.\n"
+
+#~ msgid ""
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with this program. If not, see <http://www.gnu.org/licenses/>."
+#~ msgstr ""
+#~ "سÙ?ز بÛ? پرÙ?گراÙ?Ù?ا بÙ?Ù?Û?Ù? بÙ?رگÛ?Ø? GNU ئادÛ?تتÙ?Ù?Ù? ئاÙ?Ù?Ù?Û?Ù? ئÙ?جازÛ?ت "
+#~ "ئÙ?جازÛ?تÙ?اÙ?Ù?سÙ?دÙ?Ù? بÙ?ر Ù?Û?سخا تاپشÛ?رÛ?Û?اÙ?Ù?سÙ?زØ? ئÛ?Ú¯Û?ر تاپشÛ?رÛ?Û?اÙ?Ù?Ù?غاÙ? بÙ?Ù?سÙ?ÚÙ?ز "
+#~ "<http://www.gnu.org/licenses/> غا Ù?اراÚ."
+
+#~ msgid "Mauve"
+#~ msgstr "Mauve"
+
+#~ msgid "Noir/Blanc"
+#~ msgstr "Noir/Blanc"
+
+#~ msgid "Hulk"
+#~ msgstr "Hulk"
+
+#~ msgid "Shagadelic"
+#~ msgstr "Shagadelic"
+
+#~ msgid "Vertigo"
+#~ msgstr "Vertigo"
+
+#~ msgid "Edge"
+#~ msgstr "Ú¯Ù?رÛ?Û?Ù?"
+
+#~ msgid "Dice"
+#~ msgstr "Dice"
+
+#~ msgid "Warp"
+#~ msgstr "Warp"
+
+#~ msgid "No camera found!"
+#~ msgstr "Ù?اÙ?Û?را تÛ?Ù¾Ù?Ù?Ù?Ù?دÙ?!"
+
+#~ msgid "Please refer to the help for further information."
+#~ msgstr "تÛ?Ø®Ù?Ù?Û? Ù?Ù?Ù¾ ئÛ?Ú?Û?رÙ?ار ئÛ?Ú?Û?Ù? Ù?اردÛ?Ù? Ú¾Û?ججÛ?تÙ?Ù?رÙ?Ú¯Û? Ù?اراÚ."
+
+#~ msgid "Help on this Application"
+#~ msgstr "پرÙ?گراÙ?Ù?ا Ú¾Û?Ù?Ù?Ù?دÙ?Ù?Ù? Ù?اردÛ?Ù?"
+
+#~ msgid "Countdown"
+#~ msgstr "تÛ?تÛ?ر ساÙ?اÙ?دÛ?"
+
+#~ msgid "Flash"
+#~ msgstr "Ú?اÙ?Ù?اÙ? Ù?اÙ?پا"
+
+#~ msgid "_Start Recording"
+#~ msgstr "سÙ?Ù? ئÛ?Ù?Ù?Ø´Ù?Ù? باشÙ?ا(_S)"
+
+#~ msgid "Be verbose"
+#~ msgstr "Be verbose"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cd7fdd6..9cb04da 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
"Project-Id-Version: cheese master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
"product=cheese&component=general\n"
-"POT-Creation-Date: 2010-07-22 16:07+0000\n"
-"PO-Revision-Date: 2010-07-23 10:27+0800\n"
+"POT-Creation-Date: 2010-08-09 23:12+0000\n"
+"PO-Revision-Date: 2010-08-11 19:18+0800\n"
"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
"MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: ../data/cheese-about.ui.h:1 ../data/cheese.desktop.in.in.h:1
-#: ../src/cheese-main.vala:105
+#: ../src/cheese-main.vala:103
msgid "Cheese"
msgstr "è??å?"
@@ -48,17 +48,16 @@ msgid ""
"more details.\n"
"\n"
"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>.\n"
+"this program. If not, see http://www.gnu.org/licenses/\n";
msgstr ""
-"è¿?个ç¨?åº?æ?¯è?ªç?±è½¯ä»¶ï¼?æ?¨å?¯ä»¥å?¨é?µå®?ç?±è?ªç?±è½¯ä»¶å?ºé??ä¼?å??å¸?ç?? GNU é??ç?¨å?¬å?±è®¸å?¯å??è®®ç??"
-"æ??å?µä¸?é??æ?°å??å??å®?并ä¸?/æ??è??ä¿®æ?¹å®?ï¼?æ??许å?¯å??è®®ç??第äº?ç??ï¼?æ??ï¼?ç?±æ?¨é??æ?©ï¼?ä»»ä½?æ?´æ?°ç??"
-"æ?¬ã??\n"
+"è¿?个ç¨?åº?æ?¯è?ªç?±è½¯ä»¶ï¼?æ?¨å?¯ä»¥é?µç?§ç?±è?ªç?±è½¯ä»¶å?ºé??ä¼?å??å¸?ç?? GNU é??ç?¨å?¬å?±è®¸å?¯å??è®®æ??许"
+"å?¯å??è®®ç??第äº?ç??ï¼?æ??(ç?±æ?¨é??æ?©)ä»»ä½?æ?´æ?°ç??æ?¬é??æ?°å??å??å??/æ??ä¿®æ?¹å®?ï¼?\n"
"\n"
"è¿?个ç¨?åº?æ?¬ç??å?¯åº?ç?¨ç??æ??æ?¿å??å??ï¼?ä½?ä¸?ä½?ä»»ä½?ä¿?è¯?ï¼?ç??è?³æ²¡æ??å??ä¸?æ?§ç??æ??对ç?¹å®?ç?®ç??é??"
"ç?¨æ?§ç??æ??æ??ã??æ?´å¤?ç»?è??请å??ç?? GNU é??ç?¨å?¬å?±è®¸å?¯å??è®®ã??\n"
"\n"
-"æ?¨åº?该已ç»?é??è¿?个ç¨?åº?æ?¶å?°ä¸?份 GNU é??ç?¨å?¬å?±è®¸å?¯å??è®®ï¼?å¦?æ??没æ??ï¼?è§? <http://www.";
-"gnu.org/licenses/>ã??\n"
+"æ?¨åº?该已ç»?æ?¶å?°è¿?个ç¨?åº?é??带ç??ä¸?份 GNU é??ç?¨å?¬å?±è®¸å?¯å??è®®ï¼?å¦?æ??没æ??ï¼?æ?¥ç?? "
+"<http://www.gnu.org/licenses/>ã??\n"
#: ../data/cheese-about.ui.h:10
msgid "translator-credits"
@@ -205,7 +204,7 @@ msgstr "é¦?é??项"
msgid "Resolution"
msgstr "å??辨ç??"
-#: ../data/cheese-prefs.ui.h:11 ../data/effects/saturation.effect.in.h:1
+#: ../data/cheese-prefs.ui.h:11
msgid "Saturation"
msgstr "饱å??"
@@ -360,102 +359,45 @@ msgstr "��以宽�模���"
msgid "Width resolution"
msgstr "横å??å??辨ç??"
-#: ../data/effects/agingtv.effect.in.h:1
-msgid "Historical"
-msgstr "è??ç?§ç??"
-
-#: ../data/effects/dicetv.effect.in.h:1
-msgid "Dice"
-msgstr "骰å?"
-
-#: ../data/effects/edgetv.effect.in.h:1
-msgid "Edge"
-msgstr "å? è¾¹"
-
-#: ../data/effects/hulk.effect.in.h:1
-msgid "Hulk"
-msgstr "��"
-
-#: ../data/effects/identity.effect.in.h:1
-msgid "No Effect"
-msgstr "æ? "
-
-#: ../data/effects/mauve.effect.in.h:1
-msgid "Mauve"
-msgstr "æ·¡ç´«"
-
-#: ../data/effects/noir.effect.in.h:1
-msgid "Noir/Blanc"
-msgstr "é»?ç?½"
-
-#: ../data/effects/optv.effect.in.h:1
-msgid "Optical Illusion"
-msgstr "ç?©ç?®"
-
-#: ../data/effects/quarktv.effect.in.h:1
-msgid "Quark"
-msgstr "夸å??"
-
-#: ../data/effects/radioactv.effect.in.h:1
-msgid "Radioactive"
-msgstr "��"
-
-# shagadelic æ¤è¯?æ?¯ç?±Shaggyä¸?psychedelic ( a. èµ·å¹»è§?ç??ï¼?è¿·å¹»ç??) ç»?å??è??æ?¥ç??ï¼?并没æ??ä»?ä¹?å®?é??æ??ä¹?ï¼?å?ªæ?¯ç?¨æ?¥èµ·å¤¸å¼ ä¸?ç?«è??ç??ä½?ç?¨ã??å??è§?ï¼?ã??ç??ç??大贱è°?ã??--ç??é?²æ³¨
-#: ../data/effects/shagadelictv.effect.in.h:1
-msgid "Shagadelic"
-msgstr "è¿·å¹»"
-
-#: ../data/effects/streaktv.effect.in.h:1
-msgid "Kung-Fu"
-msgstr "å??夫"
-
-#: ../data/effects/vertigotv.effect.in.h:1
-msgid "Vertigo"
-msgstr "ç?©æ??"
-
-#: ../data/effects/warptv.effect.in.h:1
-msgid "Warp"
-msgstr "æ?æ?²"
-
-#: ../libcheese/cheese-avatar-chooser.c:110
+#: ../libcheese/cheese-avatar-chooser.c:110 ../src/cheese-window.vala:589
msgid "Shutter sound"
msgstr "快�声"
-#: ../libcheese/cheese-avatar-chooser.c:236
+#: ../libcheese/cheese-avatar-chooser.c:238
msgid "Take a photo"
msgstr "æ??ç?§"
-#: ../libcheese/cheese-avatar-chooser.c:255
+#: ../libcheese/cheese-avatar-chooser.c:257
msgid "_Take a photo"
msgstr "æ??ç?§(_T)"
-#: ../libcheese/cheese-avatar-chooser.c:270
+#: ../libcheese/cheese-avatar-chooser.c:272
msgid "_Discard photo"
msgstr "丢å¼?ç?§ç??(_D)"
-#: ../libcheese/cheese-camera-device.c:328
+#: ../libcheese/cheese-camera-device.c:329
msgid "Device capabilities not supported"
msgstr "ä¸?æ?¯æ??该设å¤?ç??å?¨é?¨å??è?½"
-#: ../libcheese/cheese-camera-device.c:352
+#: ../libcheese/cheese-camera-device.c:357
#, c-format
msgid "Failed to initialize device %s for capability probing"
msgstr "å??å§?å??设å¤? %s 以å?¯ç?¨æ?¢æµ?è?½å??æ?¶å¤±è´¥"
-#: ../libcheese/cheese-camera-device.c:510
+#: ../libcheese/cheese-camera-device.c:515
msgid "Unknown device"
msgstr "��设�"
-#: ../libcheese/cheese-camera-device.c:534
+#: ../libcheese/cheese-camera-device.c:539
msgid "Cancellable initialization not supported"
msgstr "ä¸?æ?¯æ??å?¯ä¸æ?å??å§?å??"
-#: ../libcheese/cheese-camera.c:1116
+#: ../libcheese/cheese-camera.c:1154
#, c-format
msgid "No device found"
msgstr "没æ??å??ç?°è®¾å¤?"
-#: ../libcheese/cheese-camera.c:1135
+#: ../libcheese/cheese-camera.c:1173
msgid "One or more needed GStreamer elements are missing: "
msgstr "缺å°?æ??é??ç??ä¸?个æ??å¤?个 GStreamer å??ç´ ï¼?"
@@ -471,31 +413,86 @@ msgstr "缺å°?æ??é??ç??ä¸?个æ??å¤?个 GStreamer å??ç´ ï¼?"
msgid "%d "
msgstr "%d "
-#: ../src/cheese-main.vala:38
-msgid "Be verbose"
-msgstr "�示详�信�"
+#: ../src/cheese-effects-manager.vala:116
+msgid "No Effect"
+msgstr "æ? "
-#: ../src/cheese-main.vala:39
+#: ../src/cheese-main.vala:37
msgid "Enable wide mode"
msgstr "��宽�模�"
-#: ../src/cheese-main.vala:40
+#: ../src/cheese-main.vala:38
+msgid "Device to use as a camera"
+msgstr "ç?¨ä½?æ??å??头ç??设å¤?"
+
+#: ../src/cheese-main.vala:38
+msgid "DEVICE"
+msgstr "设�"
+
+#: ../src/cheese-main.vala:39
msgid "Output version information and exit"
msgstr "è¾?å?ºç??æ?¬ä¿¡æ?¯å¹¶é??å?º"
-#: ../src/cheese-main.vala:75
+#: ../src/cheese-main.vala:67
msgid "- Take photos and videos from your webcam"
msgstr "- 使ç?¨æ??å??头æ??æ??ç?§ç??å??è§?é¢?"
-#: ../src/cheese-main.vala:86
+#: ../src/cheese-main.vala:78
#, c-format
msgid "Run '%s --help' to see a full list of available command line options.\n"
msgstr "è¿?è¡?â??%s --helpâ??æ?¥æ?¥ç??å?¯ç?¨å?½ä»¤è¡?é??项ç??å®?æ?´å??表ã??\n"
-#: ../src/cheese-window.vala:601
+#: ../src/cheese-window.vala:642
msgid "Stop _Recording"
msgstr "å??æ¢å½?å??(_R)"
+#: ../src/cheese-window.vala:761
+msgid "No effects found"
+msgstr "没æ??å??ç?°ç?¹æ??"
+
+#~ msgid "Historical"
+#~ msgstr "è??ç?§ç??"
+
+#~ msgid "Dice"
+#~ msgstr "骰å?"
+
+#~ msgid "Edge"
+#~ msgstr "å? è¾¹"
+
+#~ msgid "Hulk"
+#~ msgstr "��"
+
+#~ msgid "Mauve"
+#~ msgstr "æ·¡ç´«"
+
+#~ msgid "Noir/Blanc"
+#~ msgstr "é»?ç?½"
+
+#~ msgid "Optical Illusion"
+#~ msgstr "ç?©ç?®"
+
+#~ msgid "Quark"
+#~ msgstr "夸å??"
+
+#~ msgid "Radioactive"
+#~ msgstr "��"
+
+# shagadelic æ¤è¯?æ?¯ç?±Shaggyä¸?psychedelic ( a. èµ·å¹»è§?ç??ï¼?è¿·å¹»ç??) ç»?å??è??æ?¥ç??ï¼?并没æ??ä»?ä¹?å®?é??æ??ä¹?ï¼?å?ªæ?¯ç?¨æ?¥èµ·å¤¸å¼ ä¸?ç?«è??ç??ä½?ç?¨ã??å??è§?ï¼?ã??ç??ç??大贱è°?ã??--ç??é?²æ³¨
+#~ msgid "Shagadelic"
+#~ msgstr "è¿·å¹»"
+
+#~ msgid "Kung-Fu"
+#~ msgstr "å??夫"
+
+#~ msgid "Vertigo"
+#~ msgstr "ç?©æ??"
+
+#~ msgid "Warp"
+#~ msgstr "æ?æ?²"
+
+#~ msgid "Be verbose"
+#~ msgstr "�示详�信�"
+
#~ msgid "Switch to Burst Mode"
#~ msgstr "å??æ?¢å?°è¿?æ??模å¼?"
diff --git a/src/Makefile.am b/src/Makefile.am
index ff8a80d..23896c5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,10 +10,12 @@ VALAFLAGS = \
--pkg gconf-2.0 \
--pkg gstreamer-0.10 \
--pkg unique-1.0 \
- --pkg mx-1.0 \
+ --pkg libcanberra \
+ --pkg libcanberra-gtk \
--pkg eogthumbnav \
--pkg cheese-thumbview \
- --pkg cheese-common
+ --pkg cheese-common \
+ --pkg clutter-tablelayout
AM_CPPFLAGS = \
@@ -40,16 +42,14 @@ cheese_SOURCES = \
cheese-countdown.vala \
cheese-effects-manager.vala \
cheese-preferences.vala \
- thumbview/cheese-gconf.c \
thumbview/cheese-thumb-view.c \
- thumbview/eog-thumb-nav.c \
- thumbview/eog-thumbnail.c
+ thumbview/cheese-thumbnail.c \
+ thumbview/eog-thumb-nav.c
noinst_HEADERS = \
- thumbview/cheese-gconf.h \
thumbview/cheese-thumb-view.h \
- thumbview/eog-thumb-nav.h \
- thumbview/eog-thumbnail.h
+ thumbview/cheese-thumbnail.h \
+ thumbview/eog-thumb-nav.h
cheese_LDADD = \
$(top_builddir)/libcheese/libcheesecommon.la \
diff --git a/src/cheese-countdown.vala b/src/cheese-countdown.vala
index e2edb7f..4969500 100644
--- a/src/cheese-countdown.vala
+++ b/src/cheese-countdown.vala
@@ -34,6 +34,12 @@ internal class Cheese.Countdown : GLib.Object
private static int current_value = 0;
+ private static ulong signal_id;
+
+ private static Clutter.Animation anim;
+
+ public bool running;
+
public Countdown (Clutter.Text countdown_actor)
{
this.countdown_actor = countdown_actor;
@@ -41,8 +47,8 @@ internal class Cheese.Countdown : GLib.Object
private void fade_out ()
{
- Clutter.Animation anim = this.countdown_actor.animate (Clutter.AnimationMode.LINEAR, 500, "opacity", 0);
- Signal.connect_after (anim, "completed", (GLib.Callback)fade_in, this);
+ anim = this.countdown_actor.animate (Clutter.AnimationMode.LINEAR, 500, "opacity", 0);
+ signal_id = Signal.connect_after (anim, "completed", (GLib.Callback)fade_in, this);
}
private void fade_in ()
@@ -50,19 +56,29 @@ internal class Cheese.Countdown : GLib.Object
if (this.current_value <= 0)
{
this.completed_callback ();
+ running = false;
return;
}
this.countdown_actor.text = this.current_value.to_string ();
this.current_value--;
- Clutter.Animation anim = this.countdown_actor.animate (Clutter.AnimationMode.LINEAR, 500, "opacity", 255);
- Signal.connect_after (anim, "completed", (GLib.Callback)fade_out, this);
+ anim = this.countdown_actor.animate (Clutter.AnimationMode.LINEAR, 500, "opacity", 255);
+ signal_id = Signal.connect_after (anim, "completed", (GLib.Callback)fade_out, this);
}
- public void start_countdown (CountdownCallback completed_callback)
+ public void start (CountdownCallback completed_callback)
{
this.completed_callback = completed_callback;
this.current_value = COUNTDOWN_START;
+ running = true;
+ countdown_actor.show ();
fade_in ();
}
+
+ public void stop ()
+ {
+ countdown_actor.hide ();
+ SignalHandler.disconnect (anim, signal_id);
+ running = false;
+ }
}
diff --git a/src/cheese-effects-manager.vala b/src/cheese-effects-manager.vala
index 489a43a..6c9e102 100644
--- a/src/cheese-effects-manager.vala
+++ b/src/cheese-effects-manager.vala
@@ -26,11 +26,11 @@ const string GROUP_NAME = "Effect";
internal class Cheese.EffectsManager : GLib.Object
{
- public static Cheese.Effect ? parse_effect_file (string filename)
+ public static Cheese.Effect? parse_effect_file (string filename)
{
- KeyFile kf = new KeyFile ();
- Effect eff = new Effect ();
- var locale = Intl.setlocale(LocaleCategory.ALL, "");
+ KeyFile kf = new KeyFile ();
+ Effect eff = new Effect ();
+ var locale = Intl.setlocale (LocaleCategory.ALL, "");
try
{
@@ -79,7 +79,7 @@ internal class Cheese.EffectsManager : GLib.Object
if (cur_file.has_suffix (".effect"))
{
Effect effect = EffectsManager.parse_effect_file (GLib.Path.build_filename (directory, cur_file));
- if (!effects.contains(effect))
+ if (!effects.contains (effect))
{
message ("Found %s (%s)", effect.name, effect.pipeline_desc);
list.add (effect);
@@ -99,25 +99,23 @@ internal class Cheese.EffectsManager : GLib.Object
public void load_effects ()
{
string system_effects;
+
foreach (string dir in Environment.get_system_data_dirs ())
{
system_effects = GLib.Path.build_filename (dir, "gnome-video-effects");
effects.add_all (load_effects_from_directory (system_effects));
-
}
string user_effects = GLib.Path.build_filename (Environment.get_user_data_dir (), "gnome-video-effects");
effects.add_all (load_effects_from_directory (user_effects));
- /* GROSS HACK: to make identity element appear first */
- foreach (Effect e in effects)
+ /* add identity effect as the first in the effect list */
+ if (effects.size > 0)
{
- if (e.pipeline_desc == "identity")
- {
- effects.remove (e);
- effects.insert (0, e);
- break;
- }
+ Effect e = new Effect ();
+ e.name = _("No Effect");
+ e.pipeline_desc = "identity";
+ effects.insert (0, e);
}
}
@@ -135,5 +133,4 @@ internal class Cheese.EffectsManager : GLib.Object
{
return a.pipeline_desc == b.pipeline_desc;
}
-
}
diff --git a/src/cheese-main.vala b/src/cheese-main.vala
index 773b590..731b850 100644
--- a/src/cheese-main.vala
+++ b/src/cheese-main.vala
@@ -27,29 +27,19 @@ using Unique;
public class Cheese.Main
{
- static bool verbose;
- static bool wide;
- static bool version_only;
- static FileStream log_file;
+ static bool wide;
+ static string device;
+ static bool version;
static Cheese.MainWindow main_window;
const OptionEntry[] options = {
- { "verbose", 'v', 0, OptionArg.NONE, ref verbose, N_("Be verbose"), null},
- { "wide", 'w', 0, OptionArg.NONE, ref wide, N_("Enable wide mode"), null},
- { "version", 0, 0, OptionArg.NONE, ref version_only, N_("Output version information and exit"), null},
- { null}
+ {"wide", 'w', 0, OptionArg.NONE, ref wide, N_("Enable wide mode"), null },
+ {"device", 'd', 0, OptionArg.FILENAME, ref device, N_("Device to use as a camera"), N_("DEVICE")},
+ {"version", 'v', 0, OptionArg.NONE, ref version, N_("Output version information and exit"), null },
+ {null}
};
- static void print_handler (string text)
- {
- log_file.puts (text);
- if (verbose)
- {
- stdout.puts (text);
- }
- }
-
public static Unique.Response unique_message_received (int command,
Unique.MessageData msg,
uint time)
@@ -68,8 +58,9 @@ public class Cheese.Main
Intl.bind_textdomain_codeset (Config.GETTEXT_PACKAGE, "UTF-8");
Intl.textdomain (Config.GETTEXT_PACKAGE);
- Gtk.init (ref args);
- Clutter.init (ref args);
+ Gtk.rc_parse (GLib.Path.build_filename (Config.PACKAGE_DATADIR, "gtkrc"));
+
+ GtkClutter.init (ref args);
try {
var context = new OptionContext (_("- Take photos and videos from your webcam"));
@@ -87,6 +78,12 @@ public class Cheese.Main
return 1;
}
+ if (version)
+ {
+ stdout.printf ("%s %s\n", Config.PACKAGE_NAME, Config.PACKAGE_VERSION);
+ return 0;
+ }
+
main_window = new Cheese.MainWindow ();
Unique.App app = new Unique.App ("org.gnome.Cheese", null);
@@ -105,17 +102,12 @@ public class Cheese.Main
Environment.set_application_name (_("Cheese"));
Window.set_default_icon_name ("cheese");
- string log_file_dir = GLib.Path.build_filename (Environment.get_home_dir (), ".config", "cheese");
- DirUtils.create_with_parents (log_file_dir, 0775);
- log_file = FileStream.open (GLib.Path.build_filename (log_file_dir, "cheese.log"), "w");
- set_print_handler (print_handler);
-
Gtk.IconTheme.get_default ().append_search_path (GLib.Path.build_filename (Config.PACKAGE_DATADIR, "icons"));
main_window.setup_ui ();
main_window.destroy.connect (Gtk.main_quit);
- main_window.show_all ();
- main_window.setup_camera ();
+ main_window.show ();
+ main_window.setup_camera (device);
Gtk.main ();
return 0;
diff --git a/src/cheese-preferences.vala b/src/cheese-preferences.vala
index 588342b..9fa99b2 100644
--- a/src/cheese-preferences.vala
+++ b/src/cheese-preferences.vala
@@ -24,7 +24,8 @@ using Gtk;
public class Cheese.PreferencesDialog : GLib.Object
{
private Cheese.Camera camera;
- private Cheese.GConf conf;
+
+ private GLib.Settings settings;
private Gtk.Dialog dialog;
@@ -44,46 +45,61 @@ public class Cheese.PreferencesDialog : GLib.Object
private Gtk.SpinButton burst_repeat_spin;
private Gtk.SpinButton burst_delay_spin;
- public PreferencesDialog (Cheese.Camera camera, Cheese.GConf conf)
+ private Gtk.CheckButton countdown_check;
+ private Gtk.CheckButton flash_check;
+
+ public PreferencesDialog (Cheese.Camera camera, GLib.Settings settings)
{
this.camera = camera;
- this.conf = conf;
+ this.settings = settings;
Gtk.Builder builder = new Gtk.Builder ();
- builder.add_from_file (GLib.Path.build_filename (Config.PACKAGE_DATADIR, "cheese-prefs.ui"));
+ try
+ {
+ builder.add_from_file (GLib.Path.build_filename (Config.PACKAGE_DATADIR, "cheese-prefs.ui"));
+ }
+ catch (Error err)
+ {
+ error ("Error: %s", err.message);
+ }
this.dialog = (Gtk.Dialog)builder.get_object ("cheese_prefs_dialog");
- this.brightness_adjustment = (Gtk.Adjustment)builder.get_object ("brightness_adjustment");
- this.contrast_adjustment = (Gtk.Adjustment)builder.get_object ("contrast_adjustment");
- this.hue_adjustment = (Gtk.Adjustment)builder.get_object ("hue_adjustment");
- this.saturation_adjustment = (Gtk.Adjustment)builder.get_object ("saturation_adjustment");
+ this.brightness_adjustment = (Gtk.Adjustment) builder.get_object ("brightness_adjustment");
+ this.contrast_adjustment = (Gtk.Adjustment) builder.get_object ("contrast_adjustment");
+ this.hue_adjustment = (Gtk.Adjustment) builder.get_object ("hue_adjustment");
+ this.saturation_adjustment = (Gtk.Adjustment) builder.get_object ("saturation_adjustment");
/* Here instead of in cheese-prefs.ui because of https://bugzilla.gnome.org/show_bug.cgi?id=624443 */
- this.brightness_scale = (Gtk.Scale)builder.get_object ("brightness_scale");
- this.contrast_scale = (Gtk.Scale)builder.get_object ("contrast_scale");
- this.hue_scale = (Gtk.Scale)builder.get_object ("hue_scale");
- this.saturation_scale = (Gtk.Scale)builder.get_object ("saturation_scale");
+ this.brightness_scale = (Gtk.Scale) builder.get_object ("brightness_scale");
+ this.contrast_scale = (Gtk.Scale) builder.get_object ("contrast_scale");
+ this.hue_scale = (Gtk.Scale) builder.get_object ("hue_scale");
+ this.saturation_scale = (Gtk.Scale) builder.get_object ("saturation_scale");
this.brightness_scale.add_mark (0, Gtk.PositionType.BOTTOM, null);
this.contrast_scale.add_mark (1, Gtk.PositionType.BOTTOM, null);
this.hue_scale.add_mark (0, Gtk.PositionType.BOTTOM, null);
this.saturation_scale.add_mark (1, Gtk.PositionType.BOTTOM, null);
- this.resolution_combo = (Gtk.ComboBox)builder.get_object ("resolution_combo_box");
- this.source_combo = (Gtk.ComboBox)builder.get_object ("camera_combo_box");
+ this.resolution_combo = (Gtk.ComboBox) builder.get_object ("resolution_combo_box");
+ this.source_combo = (Gtk.ComboBox) builder.get_object ("camera_combo_box");
- this.burst_repeat_spin = (Gtk.SpinButton)builder.get_object ("burst_repeat");
- this.burst_delay_spin = (Gtk.SpinButton)builder.get_object ("burst_delay");
+ this.burst_repeat_spin = (Gtk.SpinButton) builder.get_object ("burst_repeat");
+ this.burst_delay_spin = (Gtk.SpinButton) builder.get_object ("burst_delay");
+
+ this.countdown_check = (Gtk.CheckButton) builder.get_object ("countdown");
+ this.flash_check = (Gtk.CheckButton) builder.get_object ("flash");
setup_combo_box_models ();
initialize_camera_devices ();
- initialize_values_from_conf ();
+ initialize_values_from_settings ();
- // Connect signals only after all the widgets have been setup
- // Stops a bunch of unnecessary signals from being fired
- builder.connect_signals (this);
+ /*
+ * Connect signals only after all the widgets have been setup
+ * Stops a bunch of unnecessary signals from being fired
+ */
+ builder.connect_signals (this);
}
private void setup_combo_box_models ()
@@ -104,11 +120,13 @@ public class Cheese.PreferencesDialog : GLib.Object
ListStore camera_model = new ListStore (2, typeof (string), typeof (Cheese.CameraDevice));
source_combo.model = camera_model;
+ if (devices.len <= 1)
+ source_combo.sensitive = false;
for (int i = 0; i < devices.len; i++)
{
TreeIter iter;
- dev = (Cheese.CameraDevice)devices.index (i);
+ dev = (Cheese.CameraDevice) devices.index (i);
camera_model.append (out iter);
camera_model.set (iter,
0, dev.get_name () + " (" + dev.get_device_file () + " )",
@@ -119,7 +137,8 @@ public class Cheese.PreferencesDialog : GLib.Object
}
}
- setup_resolutions_for_device (camera.get_selected_device ());
+ settings.set_string("camera", camera.get_selected_device ().get_device_file ());
+ setup_resolutions_for_device (camera.get_selected_device ());
}
private void setup_resolutions_for_device (Cheese.CameraDevice device)
@@ -142,19 +161,24 @@ public class Cheese.PreferencesDialog : GLib.Object
camera.get_current_video_format ().height == format.height)
{
resolution_combo.set_active_iter (iter);
+ settings.set_int("x-resolution", format.width);
+ settings.set_int("y-resolution", format.height);
}
}
}
- private void initialize_values_from_conf ()
+ private void initialize_values_from_settings ()
{
- brightness_adjustment.value = conf.gconf_prop_brightness;
- contrast_adjustment.value = conf.gconf_prop_contrast;
- hue_adjustment.value = conf.gconf_prop_hue;
- saturation_adjustment.value = conf.gconf_prop_saturation;
+ brightness_adjustment.value = settings.get_double("brightness");
+ contrast_adjustment.value = settings.get_double("contrast");
+ hue_adjustment.value = settings.get_double("hue");
+ saturation_adjustment.value = settings.get_double("saturation");
- burst_repeat_spin.value = conf.gconf_prop_burst_repeat;
- burst_delay_spin.value = conf.gconf_prop_burst_delay / 1000;
+ burst_repeat_spin.value = settings.get_int("burst-repeat");
+ burst_delay_spin.value = settings.get_int("burst-delay") / 1000;
+
+ countdown_check.active = settings.get_boolean("countdown");
+ flash_check.active = settings.get_boolean("flash");
}
[CCode (instance_pos = -1)]
@@ -169,7 +193,7 @@ public class Cheese.PreferencesDialog : GLib.Object
camera.set_device_by_dev_file (dev.get_device_file ());
camera.switch_camera_device ();
setup_resolutions_for_device (camera.get_selected_device ());
- conf.gconf_prop_camera = dev.get_device_file ();
+ settings.set_string("camera", dev.get_device_file ());
}
[CCode (instance_pos = -1)]
@@ -183,8 +207,8 @@ public class Cheese.PreferencesDialog : GLib.Object
combo.model.get (iter, 1, out format);
camera.set_video_format (format);
- conf.gconf_prop_x_resolution = format.width;
- conf.gconf_prop_y_resolution = format.height;
+ settings.set_int("x-resolution", format.width);
+ settings.set_int("y-resolution", format.height);
}
[CCode (instance_pos = -1)]
@@ -194,43 +218,55 @@ public class Cheese.PreferencesDialog : GLib.Object
}
[CCode (instance_pos = -1)]
+ public void on_countdown_toggle (Gtk.CheckButton checkbutton)
+ {
+ settings.set_boolean("countdown", checkbutton.active);
+ }
+
+ [CCode (instance_pos = -1)]
+ public void on_flash_toggle (Gtk.CheckButton checkbutton)
+ {
+ settings.set_boolean("flash", checkbutton.active);
+ }
+
+ [CCode (instance_pos = -1)]
public void on_burst_repeat_change (Gtk.SpinButton spinbutton)
{
- conf.gconf_prop_burst_repeat = (int) spinbutton.value;
+ settings.set_int("burst-repeat", (int) spinbutton.value);
}
[CCode (instance_pos = -1)]
public void on_burst_delay_change (Gtk.SpinButton spinbutton)
{
- conf.gconf_prop_burst_delay = (int) spinbutton.value * 1000;
+ settings.set_int("burst-delay", (int) spinbutton.value * 1000);
}
[CCode (instance_pos = -1)]
public void on_brightness_change (Gtk.Adjustment adjustment)
{
this.camera.set_balance_property ("brightness", adjustment.value);
- conf.gconf_prop_brightness = adjustment.value;
+ settings.set_double("brightness", adjustment.value);
}
[CCode (instance_pos = -1)]
public void on_contrast_change (Gtk.Adjustment adjustment)
{
this.camera.set_balance_property ("contrast", adjustment.value);
- conf.gconf_prop_contrast = adjustment.value;
+ settings.set_double("contrast", adjustment.value);
}
[CCode (instance_pos = -1)]
public void on_hue_change (Gtk.Adjustment adjustment)
{
this.camera.set_balance_property ("hue", adjustment.value);
- conf.gconf_prop_hue = adjustment.value;
+ settings.set_double("hue", adjustment.value);
}
[CCode (instance_pos = -1)]
public void on_saturation_change (Gtk.Adjustment adjustment)
{
this.camera.set_balance_property ("saturation", adjustment.value);
- conf.gconf_prop_saturation = adjustment.value;
+ settings.set_double("saturation", adjustment.value);
}
public void show ()
diff --git a/src/cheese-window.vala b/src/cheese-window.vala
index e712f33..bce24bf 100644
--- a/src/cheese-window.vala
+++ b/src/cheese-window.vala
@@ -26,8 +26,8 @@ using Clutter;
using Config;
using Eog;
using Gst;
-using Mx;
using Gee;
+using CanberraGtk;
const int FULLSCREEN_TIMEOUT_INTERVAL = 5 * 1000;
const int EFFECTS_PER_PAGE = 9;
@@ -39,6 +39,8 @@ public class Cheese.MainWindow : Gtk.Window
private Gtk.Builder gtk_builder;
private Clutter.Script clutter_builder;
+ private GLib.Settings settings;
+
private Gtk.Widget thumbnails;
private GtkClutter.Embed viewport_widget;
private Gtk.VBox main_vbox;
@@ -67,9 +69,9 @@ public class Cheese.MainWindow : Gtk.Window
private Clutter.Rectangle background_layer;
private Clutter.Text error_layer;
- private Mx.Grid current_effects_grid;
+ private Clutter.Box current_effects_grid;
private int current_effects_page = 0;
- private ArrayList<Mx.Grid> effects_grids;
+ private ArrayList<Clutter.Box> effects_grids;
private Gtk.Action take_photo_action;
private Gtk.Action take_video_action;
@@ -79,6 +81,7 @@ public class Cheese.MainWindow : Gtk.Window
private Gtk.Action burst_mode_action;
private Gtk.ToggleAction effects_toggle_action;
private Gtk.ToggleAction wide_mode_action;
+ private Gtk.ToggleAction fullscreen_action;
private Gtk.Action countdown_action;
private Gtk.Action effects_page_prev_action;
private Gtk.Action effects_page_next_action;
@@ -88,13 +91,15 @@ public class Cheese.MainWindow : Gtk.Window
private bool is_recording; /* Video Recording Flag */
private bool is_bursting;
private bool is_effects_selector_active;
+ private bool is_camera_actions_sensitive;
+ private bool action_cancelled;
private Gtk.Button[] buttons;
- private Cheese.Camera camera;
- private Cheese.FileUtil fileutil;
- private Cheese.Flash flash;
- private Cheese.GConf conf;
+ private Cheese.Camera camera;
+ private Cheese.FileUtil fileutil;
+ private Cheese.Flash flash;
+
private Cheese.EffectsManager effects_manager;
private Cheese.PreferencesDialog preferences_dialog;
@@ -110,7 +115,7 @@ public class Cheese.MainWindow : Gtk.Window
public void on_preferences_dialog (Gtk.Action action)
{
if (preferences_dialog == null)
- preferences_dialog = new Cheese.PreferencesDialog (camera, conf);
+ preferences_dialog = new Cheese.PreferencesDialog (camera, settings);
preferences_dialog.show ();
}
@@ -157,10 +162,25 @@ public class Cheese.MainWindow : Gtk.Window
if (filename == null)
return; /* Nothing selected. */
- uri = GLib.Filename.to_uri (filename);
-
- screen = this.get_screen ();
- Gtk.show_uri (screen, uri, Gtk.get_current_event_time ());
+ try
+ {
+ uri = GLib.Filename.to_uri (filename);
+ screen = this.get_screen ();
+ Gtk.show_uri (screen, uri, Gtk.get_current_event_time ());
+ }
+ catch (Error err)
+ {
+ MessageDialog error_dialog = new MessageDialog (this,
+ Gtk.DialogFlags.MODAL |
+ Gtk.DialogFlags.DESTROY_WITH_PARENT,
+ Gtk.MessageType.ERROR,
+ Gtk.ButtonsType.OK,
+ "Could not open %s",
+ filename);
+
+ error_dialog.run ();
+ error_dialog.destroy ();
+ }
}
[CCode (instance_pos = -1)]
@@ -202,7 +222,23 @@ public class Cheese.MainWindow : Gtk.Window
return; /* Nothing selected. */
File file_to_trash = File.new_for_path (filename);
- file_to_trash.trash (null);
+ try
+ {
+ file_to_trash.trash (null);
+ }
+ catch (Error err)
+ {
+ MessageDialog error_dialog = new MessageDialog (this,
+ Gtk.DialogFlags.MODAL |
+ Gtk.DialogFlags.DESTROY_WITH_PARENT,
+ Gtk.MessageType.ERROR,
+ Gtk.ButtonsType.OK,
+ "Could not move %s to trash",
+ filename);
+
+ error_dialog.run ();
+ error_dialog.destroy ();
+ }
}
[CCode (instance_pos = -1)]
@@ -228,7 +264,7 @@ public class Cheese.MainWindow : Gtk.Window
file_to_trash = File.new_for_path (fileutil.get_photo_path () + GLib.Path.DIR_SEPARATOR_S + file_info.get_name ());
file_to_trash.trash (null);
}
- }catch (Error e)
+ } catch (Error e)
{
warning ("Error: %s\n", e.message);
return;
@@ -296,7 +332,7 @@ public class Cheese.MainWindow : Gtk.Window
screen = this.get_screen ();
try {
Gtk.show_uri (screen, "ghelp:cheese", Gtk.get_current_event_time ());
- }catch (Error err)
+ } catch (Error err)
{
warning ("Error: %s\n", err.message);
}
@@ -406,9 +442,9 @@ public class Cheese.MainWindow : Gtk.Window
{
fullscreen_timeout = new TimeoutSource (FULLSCREEN_TIMEOUT_INTERVAL);
fullscreen_timeout.attach (null);
- fullscreen_timeout.set_callback (() => { buttons_area.hide ();
- clear_fullscreen_timeout ();
- return true;});
+ fullscreen_timeout.set_callback (() => {buttons_area.hide ();
+ clear_fullscreen_timeout ();
+ return true; });
}
private bool fullscreen_motion_notify_callback (Gtk.Widget viewport, EventMotion e)
@@ -429,6 +465,7 @@ public class Cheese.MainWindow : Gtk.Window
* So that the next time leave_fullscreen_button_container.show_all() is called, the button is actually shown
* FIXME: If this code can be made cleaner/clearer, please do */
+ settings.set_boolean ("fullscreen", fullscreen_mode);
is_fullscreen = fullscreen_mode;
if (fullscreen_mode)
{
@@ -447,7 +484,8 @@ public class Cheese.MainWindow : Gtk.Window
/* Make all buttons look 'flat' */
foreach (Gtk.Button b in buttons)
{
- b.relief = Gtk.ReliefStyle.NONE;
+ if (b.get_name () != "take_action_button")
+ b.relief = Gtk.ReliefStyle.NONE;
}
this.fullscreen ();
viewport_widget.motion_notify_event.connect (fullscreen_motion_notify_callback);
@@ -469,7 +507,8 @@ public class Cheese.MainWindow : Gtk.Window
/* Make all buttons look, uhm, Normal */
foreach (Gtk.Button b in buttons)
{
- b.relief = Gtk.ReliefStyle.NORMAL;
+ if (b.get_name () != "take_action_button")
+ b.relief = Gtk.ReliefStyle.NORMAL;
}
/* Show the buttons area anyway - it might've been hidden in fullscreen mode */
@@ -481,8 +520,8 @@ public class Cheese.MainWindow : Gtk.Window
private void set_wide_mode (bool wide_mode)
{
- is_wide_mode = wide_mode;
- conf.gconf_prop_wide_mode = wide_mode;
+ is_wide_mode = wide_mode;
+ settings.set_boolean ("wide-mode", wide_mode);
/* keep the viewport to its current size while rearranging the ui,
* so that thumbview moves from right to bottom and viceversa
@@ -542,23 +581,43 @@ public class Cheese.MainWindow : Gtk.Window
[CCode (instance_pos = -1)]
public void on_countdown_toggle (ToggleAction action)
{
- conf.gconf_prop_countdown = action.active;
+ settings.set_boolean ("countdown", action.active);
}
private void finish_countdown_callback ()
{
- string file_name = fileutil.get_new_media_filename (this.current_mode);
+ if (!action_cancelled)
+ {
+ string file_name = fileutil.get_new_media_filename (this.current_mode);
- this.flash.fire ();
- this.camera.take_photo (file_name);
+ if (settings.get_boolean ("flash"))
+ {
+ this.flash.fire ();
+ }
+ CanberraGtk.play_for_widget (this.main_vbox, 0,
+ Canberra.PROP_EVENT_ID, "camera-shutter",
+ Canberra.PROP_MEDIA_ROLE, "event",
+ Canberra.PROP_EVENT_DESCRIPTION, _("Shutter sound"),
+ null);
+ this.camera.take_photo (file_name);
+ }
+ else
+ {
+ action_cancelled = false;
+ }
+ if (current_mode == MediaMode.PHOTO)
+ take_photo_action.sensitive = true;
}
+ Countdown current_countdown;
public void take_photo ()
{
- if (conf.gconf_prop_countdown)
+ if (settings.get_boolean ("countdown"))
{
- Countdown cd = new Countdown (this.countdown_layer);
- cd.start_countdown (finish_countdown_callback);
+ if (current_mode == MediaMode.PHOTO)
+ take_photo_action.sensitive = false;
+ current_countdown = new Countdown (this.countdown_layer);
+ current_countdown.start (finish_countdown_callback);
}
else
{
@@ -566,11 +625,12 @@ public class Cheese.MainWindow : Gtk.Window
}
}
- private int burst_count;
+ private int burst_count;
+ private uint burst_callback_id;
private bool burst_take_photo ()
{
- if (is_bursting && burst_count < conf.gconf_prop_burst_repeat)
+ if (is_bursting && burst_count < settings.get_int ("burst-repeat"))
{
this.take_photo ();
burst_count++;
@@ -584,10 +644,71 @@ public class Cheese.MainWindow : Gtk.Window
effects_toggle_action.sensitive = true;
burst_count = 0;
fileutil.reset_burst ();
+ GLib.Source.remove (burst_callback_id);
return false;
}
}
+ private bool on_key_release (Gdk.EventKey event)
+ {
+ string key;
+
+ key = Gdk.keyval_name (event.keyval);
+ if (strcmp (key, "Escape") == 0)
+ {
+ if ((current_countdown != null && current_countdown.running) || is_bursting || is_recording)
+ {
+ action_cancelled = true;
+ if (current_mode == MediaMode.PHOTO)
+ {
+ current_countdown.stop ();
+ finish_countdown_callback ();
+ }
+ else
+ if (current_mode == MediaMode.BURST)
+ {
+ current_countdown.stop ();
+ is_bursting = false;
+ burst_take_photo ();
+ }
+ else
+ if (current_mode == MediaMode.VIDEO)
+ {
+ toggle_video_recording (false);
+ }
+ action_cancelled = false;
+ }
+ else
+ if (is_effects_selector_active)
+ {
+ effects_toggle_action.set_active (false);
+ }
+ }
+ return false;
+ }
+
+ public void toggle_video_recording (bool active)
+ {
+ if (active)
+ {
+ camera.start_video_recording (fileutil.get_new_media_filename (this.current_mode));
+ take_action_button_label.label = "<b>" + _("Stop _Recording") + "</b>";
+ take_action_button_image.set_from_stock (Gtk.STOCK_MEDIA_STOP, Gtk.IconSize.BUTTON);
+ this.is_recording = true;
+ this.disable_mode_change ();
+ effects_toggle_action.sensitive = false;
+ }
+ else
+ {
+ camera.stop_video_recording ();
+ take_action_button_label.label = "<b>" + take_action_button.related_action.label + "</b>";
+ take_action_button_image.set_from_stock (Gtk.STOCK_MEDIA_RECORD, Gtk.IconSize.BUTTON);
+ this.is_recording = false;
+ this.enable_mode_change ();
+ effects_toggle_action.sensitive = true;
+ }
+ }
+
[CCode (instance_pos = -1)]
public void on_take_action (Gtk.Action action)
{
@@ -598,24 +719,7 @@ public class Cheese.MainWindow : Gtk.Window
else
if (current_mode == MediaMode.VIDEO)
{
- if (!is_recording)
- {
- camera.start_video_recording (fileutil.get_new_media_filename (this.current_mode));
- take_action_button_label.label = "<b>" + _("Stop _Recording") + "</b>";
- take_action_button_image.set_from_stock (Gtk.STOCK_MEDIA_STOP, Gtk.IconSize.BUTTON);
- this.is_recording = true;
- this.disable_mode_change ();
- effects_toggle_action.sensitive = false;
- }
- else
- {
- camera.stop_video_recording ();
- take_action_button_label.label = "<b>" + take_action_button.related_action.label + "</b>";
- take_action_button_image.set_from_stock (Gtk.STOCK_MEDIA_RECORD, Gtk.IconSize.BUTTON);
- this.is_recording = false;
- this.enable_mode_change ();
- effects_toggle_action.sensitive = true;
- }
+ toggle_video_recording (!is_recording);
}
else
if (current_mode == MediaMode.BURST)
@@ -627,7 +731,7 @@ public class Cheese.MainWindow : Gtk.Window
burst_take_photo ();
/* 3500 ms is approximate time for countdown animation to finish */
- GLib.Timeout.add ((conf.gconf_prop_burst_delay / 1000) * 3500, burst_take_photo);
+ burst_callback_id = GLib.Timeout.add ((settings.get_int ("burst-delay") / 1000) * 3500, burst_take_photo);
}
}
@@ -647,6 +751,7 @@ public class Cheese.MainWindow : Gtk.Window
{
selected_effect = event.source.get_data ("effect");
camera.set_effect (selected_effect);
+ settings.set_string ("selected-effect", selected_effect.name);
effects_toggle_action.set_active (false);
return false;
}
@@ -682,7 +787,7 @@ public class Cheese.MainWindow : Gtk.Window
viewport_layout.add ((Clutter.Actor)current_effects_grid);
this.current_effects_grid.set_size (viewport.width, viewport.height);
- for (int i = 0; i < effects_manager.effects.size - 1; i++)
+ for (int i = 0; i < effects_manager.effects.size; i++)
{
int page_of_effect = i / EFFECTS_PER_PAGE;
Cheese.Effect effect = effects_manager.effects[i];
@@ -753,7 +858,7 @@ public class Cheese.MainWindow : Gtk.Window
effects_manager = new EffectsManager ();
effects_manager.load_effects ();
- effects_grids = new ArrayList<Mx.Grid>();
+ effects_grids = new ArrayList<Clutter.Box>();
if (effects_manager.effects.size == 0)
{
@@ -762,19 +867,15 @@ public class Cheese.MainWindow : Gtk.Window
for (int i = 0; i <= effects_manager.effects.size / EFFECTS_PER_PAGE; i++)
{
- Mx.Grid grid = new Mx.Grid ();
+ Clutter.TableLayout table_layout = new TableLayout();
+ Clutter.Box grid = new Clutter.Box (table_layout);
effects_grids.add (grid);
- grid.line_alignment = Mx.Align.MIDDLE;
- grid.child_x_align = Mx.Align.MIDDLE;
- grid.child_y_align = Mx.Align.MIDDLE;
- grid.orientation = Mx.Orientation.VERTICAL;
-
- grid.column_spacing = 20;
- grid.row_spacing = 20;
+ table_layout.column_spacing = 20;
+ table_layout.row_spacing = 20;
}
- for (int i = 0; i < effects_manager.effects.size - 1; i++)
+ for (int i = 0; i < effects_manager.effects.size; i++)
{
Effect effect = effects_manager.effects[i];
Clutter.Texture texture = new Clutter.Texture ();
@@ -814,7 +915,12 @@ public class Cheese.MainWindow : Gtk.Window
"y-align", Clutter.BinAlignment.END, null
);
- effects_grids[i / EFFECTS_PER_PAGE].add ((Clutter.Actor)box);
+ Clutter.TableLayout table_layout = (Clutter.TableLayout)effects_grids[i / EFFECTS_PER_PAGE].layout_manager;
+ table_layout.pack (
+ (Clutter.Actor)box,
+ (i % EFFECTS_PER_PAGE) % 3,
+ (i % EFFECTS_PER_PAGE) / 3
+ );
}
setup_effects_page_switch_sensitivity ();
@@ -822,13 +928,82 @@ public class Cheese.MainWindow : Gtk.Window
}
}
+ private Gee.HashMap<string, bool> action_sensitivities;
+ public void toggle_camera_actions_sensitivities (bool active)
+ {
+ is_camera_actions_sensitive = active;
+ if (active)
+ {
+ foreach (string key in action_sensitivities.keys)
+ {
+ Gtk.Action action = (Gtk.Action)gtk_builder.get_object (key);
+ action.sensitive = action_sensitivities.get (key);
+ }
+ }
+ else
+ {
+ action_sensitivities = new HashMap<string, bool> (GLib.str_hash);
+ GLib.SList<weak GLib.Object> objects = gtk_builder.get_objects ();
+ foreach (GLib.Object obj in objects)
+ {
+ if (obj is Gtk.Action)
+ {
+ Gtk.Action action = (Gtk.Action)obj;
+ action_sensitivities.set (action.name, action.sensitive);
+ }
+ }
+
+ /* Keep only these actions sensitive. */
+ string active_actions[11] = { "cheese_action",
+ "edit_action",
+ "help_action",
+ "quit",
+ "help_contents",
+ "about",
+ "open",
+ "save_as",
+ "move_to_trash",
+ "delete",
+ "move_all_to_trash"};
+
+ /* Gross hack because Vala's `in` operator doesn't really work */
+ bool flag;
+ foreach (GLib.Object obj in objects)
+ {
+ flag = false;
+ if (obj is Gtk.Action)
+ {
+ Gtk.Action action = (Gtk.Action)obj;
+ foreach (string s in active_actions)
+ {
+ if (action.name == s)
+ {
+ flag = true;
+ }
+ }
+ if (!flag)
+ ((Gtk.Action)obj).sensitive = false;
+ }
+ }
+ }
+ }
+
+ private void camera_state_changed (Gst.State new_state)
+ {
+ if (new_state == Gst.State.PLAYING)
+ {
+ if (!is_camera_actions_sensitive)
+ toggle_camera_actions_sensitivities (true);
+ }
+ }
+
public void setup_ui ()
{
gtk_builder = new Gtk.Builder ();
clutter_builder = new Clutter.Script ();
fileutil = new FileUtil ();
flash = new Flash (this);
- conf = new GConf ();
+ settings = new GLib.Settings ("org.gnome.Cheese");
try {
gtk_builder.add_from_file (GLib.Path.build_filename (Config.PACKAGE_DATADIR, "cheese-actions.ui"));
@@ -837,10 +1012,9 @@ public class Cheese.MainWindow : Gtk.Window
gtk_builder.connect_signals (this);
clutter_builder.load_from_file (GLib.Path.build_filename (Config.PACKAGE_DATADIR, "cheese-viewport.json"));
- }catch (Error err)
+ } catch (Error err)
{
- warning ("Error: %s\n", err.message);
- return;
+ error ("Error: %s", err.message);
}
main_vbox = (Gtk.VBox)gtk_builder.get_object ("mainbox_normal");
@@ -871,17 +1045,18 @@ public class Cheese.MainWindow : Gtk.Window
effects_toggle_action = (Gtk.ToggleAction)gtk_builder.get_object ("effects_toggle");
countdown_action = (Gtk.Action)gtk_builder.get_object ("countdown");
wide_mode_action = (Gtk.ToggleAction)gtk_builder.get_object ("wide_mode");
+ fullscreen_action = (Gtk.ToggleAction)gtk_builder.get_object ("fullscreen");
effects_page_next_action = (Gtk.Action)gtk_builder.get_object ("effects_page_next");
effects_page_prev_action = (Gtk.Action)gtk_builder.get_object ("effects_page_prev");
/* Array contains all 'buttons', for easier manipulation
* IMPORTANT: IF ANOTHER BUTTON IS ADDED UNDER THE VIEWPORT, ADD IT TO THIS ARRAY */
- buttons = { photo_toggle_button,
- video_toggle_button,
- burst_toggle_button,
- take_action_button,
- effects_toggle_button,
- leave_fullscreen_button};
+ buttons = {photo_toggle_button,
+ video_toggle_button,
+ burst_toggle_button,
+ take_action_button,
+ effects_toggle_button,
+ leave_fullscreen_button};
video_preview = (Clutter.Texture)clutter_builder.get_object ("video_preview");
viewport_layout = (Clutter.Box)clutter_builder.get_object ("viewport_layout");
@@ -913,26 +1088,41 @@ public class Cheese.MainWindow : Gtk.Window
/* call set_active instead of our set_wide_mode so that the toggle
* action state is updated */
- wide_mode_action.set_active (conf.gconf_prop_wide_mode);
+ wide_mode_action.set_active (settings.get_boolean ("wide-mode"));
/* apparently set_active doesn't emit toggled nothing has
* changed, do it manually */
- if (!conf.gconf_prop_wide_mode) wide_mode_action.toggled ();
-
+ if (!settings.get_boolean ("wide-mode"))
+ wide_mode_action.toggled ();
set_mode (MediaMode.PHOTO);
setup_effects_selector ();
+
+ toggle_camera_actions_sensitivities (false);
+
+ this.key_release_event.connect (on_key_release);
+
+ if (settings.get_boolean ("fullscreen"))
+ fullscreen_action.active = true;
}
- public void setup_camera ()
+ public void setup_camera (string ? uri)
{
- camera = new Camera (video_preview,
- conf.gconf_prop_camera,
- conf.gconf_prop_x_resolution,
- conf.gconf_prop_y_resolution);
+ string device;
+ Effect effect;
+ double value;
+ if (uri != null && uri.length > 0)
+ device = uri;
+ else
+ device = settings.get_string ("camera");
+
+ camera = new Camera (video_preview,
+ device,
+ settings.get_int ("x-resolution"),
+ settings.get_int ("y-resolution"));
try {
- camera.setup (conf.gconf_prop_camera);
+ camera.setup (device);
}
catch (Error err)
{
@@ -940,43 +1130,32 @@ public class Cheese.MainWindow : Gtk.Window
warning ("Error: %s\n", err.message);
error_layer.text = err.message;
error_layer.show ();
- GLib.SList<weak GLib.Object> objects = gtk_builder.get_objects ();
-
- /* Keep only these actions sensitive. */
- string active_actions[11] = { "cheese_action",
- "edit_action",
- "help_action",
- "quit",
- "help_contents",
- "about",
- "open",
- "save_as",
- "move_to_trash",
- "delete",
- "move_all_to_trash"};
- /* Gross hack because Vala's `in` operator doesn't really work */
- bool flag;
- foreach (GLib.Object obj in objects)
- {
- flag = false;
- if (obj is Gtk.Action)
- {
- Gtk.Action action = (Gtk.Action)obj;
- foreach (string s in active_actions)
- {
- if (action.name == s)
- {
- flag = true;
- }
- }
- if (!flag)
- ((Gtk.Action)obj).sensitive = false;
- }
- }
+ toggle_camera_actions_sensitivities (false);
return;
}
+ effect = effects_manager.get_effect (settings.get_string ("selected-effect"));
+ if (effect != null)
+ camera.set_effect (effect);
+
+ value = settings.get_double("brightness");
+ if (value != 0.0)
+ camera.set_balance_property ("brightness", value);
+
+ value = settings.get_double("contrast");
+ if (value != 1.0)
+ camera.set_balance_property ("contrast", value);
+
+ value = settings.get_double("hue");
+ if (value != 0.0)
+ camera.set_balance_property ("hue", value);
+
+ value = settings.get_double("saturation");
+ if (value != 1.0)
+ camera.set_balance_property ("saturation", value);
+
+ camera.state_changed.connect (camera_state_changed);
camera.play ();
}
}
diff --git a/src/thumbview/cheese-thumb-view.c b/src/thumbview/cheese-thumb-view.c
index 18c1fb7..c39a487 100644
--- a/src/thumbview/cheese-thumb-view.c
+++ b/src/thumbview/cheese-thumb-view.c
@@ -29,7 +29,7 @@
#include <string.h>
#include "cheese-fileutil.h"
-#include "eog-thumbnail.h"
+#include "cheese-thumbnail.h"
#include "cheese-thumb-view.h"
@@ -154,7 +154,7 @@ cheese_thumb_view_thread_append_item (gpointer data)
}
else
{
- eog_thumbnail_add_frame (&pixbuf);
+ cheese_thumbnail_add_frame (&pixbuf);
}
gdk_threads_enter ();
@@ -595,7 +595,7 @@ cheese_thumb_view_init (CheeseThumbView *thumb_view)
GFile *file;
- eog_thumbnail_init ();
+ cheese_thumbnail_init ();
priv->store = gtk_list_store_new (3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING);
priv->n_items = 0;
diff --git a/src/thumbview/eog-thumbnail.c b/src/thumbview/cheese-thumbnail.c
similarity index 75%
rename from src/thumbview/eog-thumbnail.c
rename to src/thumbview/cheese-thumbnail.c
index a19e348..40fe492 100644
--- a/src/thumbview/eog-thumbnail.c
+++ b/src/thumbview/cheese-thumbnail.c
@@ -1,11 +1,12 @@
-/* Eye Of Gnome - Thumbnailing functions
+/*
+ * Copyright © 2010 daniel g. siegel <dgsiegel gnome org>
*
- * Copyright (C) 2000-2007 The Free Software Foundation
*
- * Author: Lucas Rocha <lucasr gnome org>
+ * Based on eog and eel code by:
+ * - Lucas Rocha <lucasr gnome org>
+ * - Andy Hertzfeld <andy eazel com>
*
- * Based on eel code (eel/eel-graphic-effects.c) by:
- * - Andy Hertzfeld <andy eazel com>
+ * Licensed under the GNU General Public License Version 2
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,18 +19,19 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/* NOTE this is a stripped version of eog-thumbnail which only contains the
- * functions necessary for cheese
- */
#ifdef HAVE_CONFIG_H
#include <cheese-config.h>
#endif
-#include "eog-thumbnail.h"
+#include "cheese-thumbnail.h"
+
+#define CHEESE_THUMBNAIL_FRAME_LEFT 3
+#define CHEESE_THUMBNAIL_FRAME_TOP 3
+#define CHEESE_THUMBNAIL_FRAME_RIGHT 3
+#define CHEESE_THUMBNAIL_FRAME_BOTTOM 3
static GdkPixbuf *frame = NULL;
@@ -123,14 +125,14 @@ art_rgb_run_alpha (guint8 *buf, guint8 r, guint8 g, guint8 b, int alpha, int n)
}
static GdkPixbuf *
-eog_thumbnail_stretch_frame_image (GdkPixbuf *frame_image,
- gint left_offset,
- gint top_offset,
- gint right_offset,
- gint bottom_offset,
- gint dest_width,
- gint dest_height,
- gboolean fill_flag)
+cheese_thumbnail_stretch_frame_image (GdkPixbuf *frame_image,
+ gint left_offset,
+ gint top_offset,
+ gint right_offset,
+ gint bottom_offset,
+ gint dest_width,
+ gint dest_height,
+ gboolean fill_flag)
{
GdkPixbuf *result_pixbuf;
guchar *pixels_ptr;
@@ -253,38 +255,41 @@ eog_thumbnail_stretch_frame_image (GdkPixbuf *frame_image,
}
void
-eog_thumbnail_add_frame (GdkPixbuf **thumbnail)
+cheese_thumbnail_add_frame (GdkPixbuf **pixbuf)
{
- GdkPixbuf *result_pixbuf;
- gint source_width, source_height;
- gint dest_width, dest_height;
-
- source_width = gdk_pixbuf_get_width (*thumbnail);
- source_height = gdk_pixbuf_get_height (*thumbnail);
-
- dest_width = source_width + 9;
- dest_height = source_height + 9;
-
- result_pixbuf = eog_thumbnail_stretch_frame_image (frame,
- 3, 3, 6, 6,
- dest_width,
- dest_height,
- FALSE);
-
- gdk_pixbuf_copy_area (*thumbnail,
- 0, 0,
- source_width,
- source_height,
- result_pixbuf,
- 3, 3);
-
- g_object_unref (*thumbnail);
-
- *thumbnail = result_pixbuf;
+ GdkPixbuf *result;
+ int source_width, source_height;
+ int dest_width, dest_height;
+ int left_offset, right_offset, top_offset, bottom_offset;
+
+ left_offset = CHEESE_THUMBNAIL_FRAME_LEFT;
+ right_offset = CHEESE_THUMBNAIL_FRAME_RIGHT;
+ top_offset = CHEESE_THUMBNAIL_FRAME_TOP;
+ bottom_offset = CHEESE_THUMBNAIL_FRAME_BOTTOM;
+
+ source_width = gdk_pixbuf_get_width (*pixbuf);
+ source_height = gdk_pixbuf_get_height (*pixbuf);
+
+ dest_width = source_width + left_offset + right_offset;
+ dest_height = source_height + top_offset + bottom_offset;
+
+ result = cheese_thumbnail_stretch_frame_image (frame,
+ left_offset,
+ top_offset,
+ right_offset,
+ bottom_offset,
+ dest_width,
+ dest_height,
+ FALSE);
+
+ gdk_pixbuf_copy_area (*pixbuf, 0, 0, source_width, source_height, result, left_offset, top_offset);
+ g_object_unref (*pixbuf);
+
+ *pixbuf = result;
}
void
-eog_thumbnail_init (void)
+cheese_thumbnail_init (void)
{
if (frame == NULL)
{
diff --git a/src/thumbview/eog-thumbnail.h b/src/thumbview/cheese-thumbnail.h
similarity index 53%
rename from src/thumbview/eog-thumbnail.h
rename to src/thumbview/cheese-thumbnail.h
index 9bfab10..913d05f 100644
--- a/src/thumbview/eog-thumbnail.h
+++ b/src/thumbview/cheese-thumbnail.h
@@ -1,11 +1,12 @@
-/* Eye Of Gnome - Thumbnailing functions
+/*
+ * Copyright © 2010 daniel g. siegel <dgsiegel gnome org>
*
- * Copyright (C) 2000-2007 The Free Software Foundation
*
- * Author: Lucas Rocha <lucasr gnome org>
+ * Based on eog and eel code by:
+ * - Lucas Rocha <lucasr gnome org>
+ * - Andy Hertzfeld <andy eazel com>
*
- * Based on nautilus code (libnautilus-private/nautilus-thumbnail.c) by:
- * - Andy Hertzfeld <andy eazel com>
+ * Licensed under the GNU General Public License Version 2
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,22 +19,20 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _EOG_THUMBNAIL_H_
-#define _EOG_THUMBNAIL_H_
+#ifndef _CHEESE_THUMBNAIL_H_
+#define _CHEESE_THUMBNAIL_H_
#include <gdk-pixbuf/gdk-pixbuf.h>
G_BEGIN_DECLS
-void eog_thumbnail_init (void);
+void cheese_thumbnail_init (void);
-
-void eog_thumbnail_add_frame (GdkPixbuf **thumbnail);
+void cheese_thumbnail_add_frame (GdkPixbuf **pixbuf);
G_END_DECLS
-#endif /* _EOG_THUMBNAIL_H_ */
+#endif /* _CHEESE_THUMBNAIL_H_ */
diff --git a/src/vapi/cheese-common.vapi b/src/vapi/cheese-common.vapi
index c02621c..eee8cdc 100644
--- a/src/vapi/cheese-common.vapi
+++ b/src/vapi/cheese-common.vapi
@@ -56,6 +56,7 @@ namespace Cheese
public virtual signal void photo_saved ();
public virtual signal void photo_taken (Gdk.Pixbuf pixbuf);
public virtual signal void video_saved ();
+ public virtual signal void state_changed (Gst.State new_state);
}
[CCode (cheader_filename = "cheese-camera-device.h")]
public class CameraDevice : GLib.Object, GLib.Initable
@@ -93,8 +94,6 @@ namespace Cheese
{
[CCode (cname = "cheese_fileutil_new", has_construct_function = false)]
public FileUtil ();
- [CCode (cname = "cheese_fileutil_get_log_path")]
- public unowned string get_log_path ();
[CCode (cname = "cheese_fileutil_get_new_media_filename")]
public unowned string get_new_media_filename (Cheese.MediaMode mode);
[CCode (cname = "cheese_fileutil_get_path_before_224")]
@@ -115,43 +114,6 @@ namespace Cheese
public void fire ();
}
- [CCode (cheader_filename = "cheese-gconf.h")]
- public class GConf : GLib.Object
- {
- [CCode (has_construct_function = false)]
- public GConf ();
- [NoAccessorMethod]
- public double gconf_prop_brightness {get; set;}
- [NoAccessorMethod]
- public int gconf_prop_burst_delay {get; set;}
- [NoAccessorMethod]
- public int gconf_prop_burst_repeat {get; set;}
- [NoAccessorMethod]
- public string gconf_prop_camera {owned get; set;}
- [NoAccessorMethod]
- public double gconf_prop_contrast {get; set;}
- [NoAccessorMethod]
- public bool gconf_prop_countdown {get; set;}
- [NoAccessorMethod]
- public bool gconf_prop_enable_delete {get; set;}
- [NoAccessorMethod]
- public double gconf_prop_hue {get; set;}
- [NoAccessorMethod]
- public string gconf_prop_photo_path {owned get; set;}
- [NoAccessorMethod]
- public double gconf_prop_saturation {get; set;}
- [NoAccessorMethod]
- public string gconf_prop_selected_effects {owned get; set;}
- [NoAccessorMethod]
- public string gconf_prop_video_path {owned get; set;}
- [NoAccessorMethod]
- public bool gconf_prop_wide_mode {get; set;}
- [NoAccessorMethod]
- public int gconf_prop_x_resolution {get; set;}
- [NoAccessorMethod]
- public int gconf_prop_y_resolution {get; set;}
- }
-
[Compact]
[CCode (type_id = "CHEESE_TYPE_VIDEO_FORMAT", cheader_filename = "cheese-camera-device.h")]
public class VideoFormat
diff --git a/src/vapi/clutter-tablelayout.vapi b/src/vapi/clutter-tablelayout.vapi
new file mode 100644
index 0000000..70e4079
--- /dev/null
+++ b/src/vapi/clutter-tablelayout.vapi
@@ -0,0 +1,45 @@
+using Clutter;
+
+[CCode (cprefix = "Clutter", lower_case_cprefix = "clutter_", gir_namespace = "Clutter", gir_version = "1.0")]
+namespace Clutter {
+
+
+ [CCode (cprefix = "CLUTTER_TABLE_ALIGNMENT_", cheader_filename = "clutter/clutter.h")]
+ public enum TableAlignment {
+ START,
+ CENTER,
+ END
+ }
+
+ [CCode (cheader_filename = "clutter/clutter.h")]
+ public class TableLayout : Clutter.LayoutManager {
+ [CCode (type = "ClutterLayoutManager*", has_construct_function = false)]
+ public TableLayout ();
+ public void get_alignment (Clutter.Actor actor, Clutter.TableAlignment x_align, Clutter.TableAlignment y_align);
+ public int get_column_count ();
+ public uint get_column_spacing ();
+ public uint get_easing_duration ();
+ public ulong get_easing_mode ();
+ public void get_expand (Clutter.Actor actor, bool x_expand, bool y_expand);
+ public void get_fill (Clutter.Actor actor, bool x_fill, bool y_fill);
+ public int get_row_count ();
+ public uint get_row_spacing ();
+ public void get_span (Clutter.Actor actor, int column_span, int row_span);
+ public bool get_use_animations ();
+ public void pack (Clutter.Actor actor, int column, int row);
+ public void set_alignment (Clutter.Actor actor, Clutter.TableAlignment x_align, Clutter.TableAlignment y_align);
+ public void set_column_spacing (uint spacing);
+ public void set_easing_duration (uint msecs);
+ public void set_easing_mode (ulong mode);
+ public void set_expand (Clutter.Actor actor, bool x_expand, bool y_expand);
+ public void set_fill (Clutter.Actor actor, bool x_fill, bool y_fill);
+ public void set_row_spacing (uint spacing);
+ public void set_span (Clutter.Actor actor, int column_span, int row_span);
+ public void set_use_animations (bool animate);
+ public uint column_spacing { get; set; }
+ public uint easing_duration { get; set; }
+ public ulong easing_mode { get; set; }
+ public uint row_spacing { get; set; }
+ public bool use_animations { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/tests/cheese-test-widget.c b/tests/cheese-test-widget.c
index 7318e80..5b502ee 100644
--- a/tests/cheese-test-widget.c
+++ b/tests/cheese-test-widget.c
@@ -30,7 +30,7 @@ main (int argc, char **argv)
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
- gtk_init (&argc, &argv);
+ gtk_clutter_init (&argc, &argv);
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
